5-21

.gitconfig

@@ -10,22 +10,25 @@
 
 [alias]
 	a = add -p
-    ac = !git add -p && git commit --amend
+    ac = !git add -p && git commit --amend -n --no-edit
   b = branch
     ba = branch -a
     bc = rev-parse --abbrev-ref HEAD
     bd = branch -D
     br = branch -r
   ci = commit --verbose
-    cia = commit --amend --verbose
-    cim	= commit -m
-  cl = clean
+    cia = commit --amend --verbose --no-edit -n
+    acia = !git add \"$1\" && git commit --amend --no-edit -n
+    cim	= commit -n -m
+    cl = clean
     clf = clean -f
   co = checkout
     cob = checkout -b
     cop = checkout -p
     cot = checkout --track
   cp = cherry-pick
+  cpa = cherry-pick --abort
+  cpc = cherry-pick --continue --no-verify
   d = diff
     ds  = diff --stat
     dc  = diff --cached
@@ -39,6 +42,7 @@
     lp = log -p --date=short
     lpj = log -p --date=short --author jlaster HEAD~20..HEAD
 
+    lo = log --oneline
     ls = log --stat
     lh = log --date=short --pretty=oneline HEAD~100..HEAD
     lhs = log --date=short --stat HEAD~100..HEAD
@@ -53,6 +57,7 @@
     rih3 = rebase -i HEAD~3
     rih4 = rebase -i HEAD~4
     rih5 = rebase -i HEAD~5
+    rih10 = rebase -i HEAD~10
     rih = rebase -i~HEAD~10
 	re = reset
     reh = reset HEAD
@@ -69,12 +74,15 @@
     ptt = t push-to-try ../fx-team -b do -p linux,macosx64,win32 -u mochitest-dt,mochitest-e10s-devtools-chrome -t none
 
 
+  undo = "!git reset HEAD~1 \"$1\" && git checkout \"$1\" "
   hgp = "show --binary --find-renames --format=\"# HG changeset patch%n# User %an <%ae>%n%B\" -U8"
 
 [core]
 	pager = less -r
-  editor = /usr/bin/vim
-
+	editor = /usr/bin/vim
 
 [color]
   ui = true
+
+[pager]
+	branch = false

aliases.zsh

@@ -6,6 +6,7 @@ export OS="~/src/_os"
 export JS="$OS/_js"
 export MOZ="~/src/moz"
 export GECKO="~/src/moz/gecko-dev"
+export NIGHTLY="/Applications/Firefox Nightly.app/Contents/MacOS/firefox"
 
 alias os="cd $OS"
 alias moz="cd $MOZ"
@@ -15,6 +16,10 @@ alias m="$GECKO/mach"
 alias mb="cd $GECKO; $GECKO/mach build; cd -"
 alias mbf="cd $GECKO; $GECKO/mach build faster; cd -"
 alias mcb="cd $GECKO; ./mach clobber; ./mach build; cd -"
+alias mbr="cd $GECKO; ./mach build faster; ./mach run -P dev1 --jsdebugger; cd -"
+alias mr="cd $GECKO; ./mach run -P dev5; cd -"
+alias mrd="cd $GECKO; ./mach run -P dev5 --jsdebugger; cd -"
+
 
 alias launch="cd ~/src/moz/devtools-core/packages/devtools-launchpad"