diff --git a/git/gitconfig b/git/gitconfig
index 5563409..bf2d73d 100644
--- a/git/gitconfig
+++ b/git/gitconfig
@@ -16,6 +16,10 @@
   a = add                           # add
   chunkyadd = add --patch           # stage commits chunk by chunk
 
+  # via http://blog.apiaxle.com/post/handy-git-tips-to-stop-you-getting-fired/
+  snapshot = !git stash save "snapshot: $(date)" && git stash apply "stash@{0}"
+  snapshots = !git stash list --grep snapshot
+
   # branch
   b = branch -v                     # branch (verbose)
 
@@ -111,6 +115,7 @@
   # Git diff will use (i)ndex, (w)ork tree, (c)ommit and (o)bject
   # instead of a/b/c/d as prefixes for patches
   mnemonicprefix = true
+	algorithm = patience
 [rerere]
   # Remember my merges
   # http://gitfu.wordpress.com/2008/04/20/git-rerere-rereremember-what-you-did-last-time/