tigrc: add missing empty line

[config/dotfiles.git] / gitconfig.in

diff --git a/gitconfig.in b/gitconfig.in
index 6d84c262848035cd2f3a0ba64fc478a7b3d525ec..f54be46c38c9ea7714b6cf37f65df5d46eeec535 100644 (file)
--- a/gitconfig.in
+++ b/gitconfig.in
@@ -66,6 +66,7 @@
        dc  = diff --cached
        dcw = diff --cached --color-words
        ds  = diff --stat
+       g   = grep
        s   = status
        l   = log
        ls  = log --stat
@@ -150,7 +151,7 @@
        renames = copy
 
        # Diff algorithm to use.
-       algorithm = patience
+       algorithm = histogram
 
        # Change the definition of a word as used by diff --color-words to be
        # shorter (not only spaces) and thus simplify the generated diffs.
@@ -174,6 +175,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