X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=gitconfig.in;h=b6292ad21d6ef7182892238d57d5287774482f1c;hb=3d1b8f3b2ea96c7779bb2582f71bf5fbac236373;hp=d52b16a658491bae729bc9fe0d1133362e25b427;hpb=5963f2f7d075d45e21b5b4cfd203cab3263fd8d7;p=config%2Fdotfiles.git

diff --git a/gitconfig.in b/gitconfig.in
index d52b16a..b6292ad 100644
--- a/gitconfig.in
+++ b/gitconfig.in
@@ -109,8 +109,8 @@
 	ss  = stash save
 	ssk = stash save --keep-index
 	ssu = stash save --include-untracked
-	sa  = stash apply
-	sp  = stash pop
+	sa  = stash apply --index
+	sp  = stash pop --index
 
 	## Custom commands.
 	#
@@ -174,6 +174,10 @@
 [diff "sqlite"]
 	textconv = sh -c 'exec sqlite3 "$@" .dump' -
 
+[log]
+	# Display branches/tag names in log (same as log's --decorate option).
+	decorate = short
+
 [merge]
 	tool = vimdiff