gitconfig: fix typo in color option

[config/dotfiles.git] / gitconfig.in

diff --git a/gitconfig.in b/gitconfig.in
index b6292ad21d6ef7182892238d57d5287774482f1c..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
@@ -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.