# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1383579181 18000
# Node ID 0856b1d8b0c3fcd1d8d46f0487b66aca1405c0bb
# Parent  6908dae7c07b16bad71796a38613393973ebe7cd
mor

diff -r 6908dae7c07b -r 0856b1d8b0c3 fish/config.fish
--- a/fish/config.fish	Wed Oct 30 10:58:10 2013 -0400
+++ b/fish/config.fish	Mon Nov 04 10:33:01 2013 -0500
@@ -160,6 +160,18 @@
 end
 
 # }}}
+# Completions {{{
+
+function make_completion --argument alias command
+    complete -c $alias -xa "(
+        set -l cmd (commandline -pc | sed -e 's/^ *\S\+ *//' );
+        complete -C\"$command \$cmd\";
+    )"
+end
+
+make_completion g "git"
+
+# }}}
 # Bind Keys {{{
 
 # Backwards compatibility?  Screw that, it's more important that our function
diff -r 6908dae7c07b -r 0856b1d8b0c3 gitconfig
--- a/gitconfig	Wed Oct 30 10:58:10 2013 -0400
+++ b/gitconfig	Mon Nov 04 10:33:01 2013 -0500
@@ -34,7 +34,7 @@
     ci = commit
     cm = commit -m
 
-    d = !git diff | vim -R -
+    d = "!sh -c 'git diff $* | vim -R -' -"
     di = !git diff --cached | vim -R -
 
     co = checkout
@@ -46,6 +46,12 @@
     unstage = reset HEAD
     uns = reset HEAD
 
+    shelve = stash save --include-untracked
+    unshelve = stash pop
+
+    shel = shelve
+    unshel = unshelve
+
     delete-local-branch = branch -D
     delete-remote-branch = push origin --delete
     delete-local-reference-to-remote-branch = branch -rd