gitconfig: fix typo in color option

[config/dotfiles.git] / gitconfig.in

diff --git a/gitconfig.in b/gitconfig.in
index d52b16a658491bae729bc9fe0d1133362e25b427..43819d60fc35c62b78748857fa811c877d44b663 100644 (file)
--- a/gitconfig.in
+++ b/gitconfig.in
@@ -1,6 +1,6 @@
 # Global Git configuration file.
 
-# Copyright (C) 2011-2014  Simon Ruderich
+# Copyright (C) 2011-2015  Simon Ruderich
 #
 # This file is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -29,7 +29,7 @@
        # Hunk header.
        frag = magenta bold
        # Function in hunk header.
-       function = magenta bold
+       func = magenta bold
        # Removed lines.
        old = red bold
        # Added lines.
@@ -66,6 +66,7 @@
        dc  = diff --cached
        dcw = diff --cached --color-words
        ds  = diff --stat
+       g   = grep
        s   = status
        l   = log
        ls  = log --stat
@@ -109,8 +110,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.
        #
@@ -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