gitconfig in zsh_dots-0.5.3

- old
+ new

@@ -9,21 +9,22 @@
 	ci = commit
 	st = status
 	on = branch
 	br = branch
   co = checkout
-  # Log display from screencast, with train tracks.
+  # Log display from "Advanced Git" PeepCode screencast, with train tracks.
   l = log --graph --pretty=format':%C(yellow)%h%Cblue%d%Creset %s %C(white) %an, %ar%Creset'
   # Alternate log display from Scott Chacon
   lol = log --pretty=oneline --abbrev-commit --graph --decorate
   # Other useful aliases:
   unstage = reset HEAD
   staged = diff --cached
   unstaged = diff
   current-branch = !git symbolic-ref -q HEAD | sed -e 's|^refs/heads/||'
   # Usage: git track origin/feature-123-login-form
   track = checkout -t
+  restore = stash pop
 [apply]
   whitespace = warn
 [color]
   diff = auto
   status = auto
@@ -36,11 +37,14 @@
 [push]
   # Only push branches that have been set up to track a remote branch.
   default = current
 [core]
 	editor = vim
-[mergetool "mvimdiff"]
-	cmd = mvim -d -g $LOCAL $MERGED $REMOTE
-  trustExitCode = true
+  pager = less -r
+	excludesfile = /Users/necromancer/.gitignore
 [merge]
-  tool = mvimdiff
+  tool = vimdiff
 
+[gitProcess]
+	keepLocalIntegrationBranch = true
+[rerere]
+	enabled = 1