# HG changeset patch
# User Jeff Hammel <jhammel@mozilla.com>
# Date 1371664008 25200
# Node ID 5438630e118c0698dce2e2fda7b1a6a923ffd9f7
# Parent  4d5d5097686f2adf463a5be1dbc6ef2519029324# Parent  5b67dd5ce0ba1326e6adcdba7906e7908588f7ef
second commit

diff -r 5b67dd5ce0ba -r 5438630e118c .emacs
--- a/.emacs	Tue Jun 18 15:44:55 2013 -0700
+++ b/.emacs	Wed Jun 19 10:46:48 2013 -0700
@@ -1,7 +1,16 @@
-;; emacs server (what a piece of crap)
-(require 'server)
- (or (server-running-p)
-     (server-start))
+;; ;; ;; emacs server (what a piece of crap)
+;; (require 'server)
+;;   (unless (server-running-p)
+;;     (server-start))
+;; ;; ;; An error has occurred while loading `/home/jhammel/.emacs':
+;; ;; ;; Symbol's function definition is void: server-running-p
+;; ;; ;; To ensure normal operation, you should investigate and remove the
+;; ;; ;; cause of the error in your initialization file.  Start Emacs with
+;; ;; ;; the `--debug-init' option to view a complete error backtrace.
+
+;; ;; ;; For information about GNU Emacs and the GNU system, type C-h C-a.
+;; ;; How to fix:
+;; http://stackoverflow.com/questions/9999320/how-to-check-if-a-function-e-g-server-running-p-is-available-under-emacs
 
 ;;;; bars
 
diff -r 5b67dd5ce0ba -r 5438630e118c .gitconfig
--- a/.gitconfig	Tue Jun 18 15:44:55 2013 -0700
+++ b/.gitconfig	Wed Jun 19 10:46:48 2013 -0700
@@ -5,7 +5,9 @@
 	email = jhammel@mozilla.com
 [alias]
         branches = branch -a
+        branchname = git rev-parse --abbrev-ref HEAD
         discard = reset HEAD --hard
+        patch = !git diff > ~/$(git rev-parse --abbrev-ref HEAD).diff
         root = rev-parse --show-toplevel
         st = status
-        up = !git pull mozilla master && git push origin master
\ No newline at end of file
+        up = !git pull mozilla master && git push origin master