gitconfig: display decoration in logs

[config/dotfiles.git] / gitconfig.in

diff --git a/gitconfig.in b/gitconfig.in
index 448000a3c431d301284206599c39b2ab2727c050..b6292ad21d6ef7182892238d57d5287774482f1c 100644 (file)
--- 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.
        #
@@ -160,7 +160,7 @@
        # changes to non-word characters are shown character wise (e.g. from
        # "==" to "!=" as "[-=-]{+!+}="); [-..-] is removal, {+..+} is
        # addition. See t/ for some tests and examples.
-       wordregex = [a-zA-Z0-9_]+|[^a-zA-Z0-9_]
+       wordRegex = [a-zA-Z0-9_]+|[^a-zA-Z0-9_]
 
 # Allow diffing of some binary files.
 #
@@ -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