gitconfig: enable diff.mnemonicprefix

[config/dotfiles.git] / gitconfig.in

diff --git a/gitconfig.in b/gitconfig.in
index 11f725a0fcd8c0002f19e6d5c176e21316a4d44f..00045f4951e2c0a9620e908643a1de0c51c07085 100644 (file)
--- a/gitconfig.in
+++ b/gitconfig.in
@@ -73,6 +73,7 @@
        dcw = diff --cached --color-words
        dcs = diff --cached --stat
        g   = grep
+       gi  = grep --ignore-case
        s   = status
        l   = log
        ls  = log --stat
@@ -84,7 +85,7 @@
        rs  = reset
        rsh = reset --hard
        rsp = reset --patch
-       # Only clean ignored files.
+       rv  = revert
        cl  = clean -ndx
        clf = clean -fdx
        ## Branches.
@@ -96,6 +97,8 @@
        re  = rebase
        rei = rebase --interactive
        rec = rebase --continue
+       ## Submodules.
+       sm  = submodule
        ## Remote.
        f   = fetch
        t   = tag
@@ -169,6 +172,10 @@
        # Diff algorithm to use.
        algorithm = histogram
 
+       # Replace "a/" and "b/" prefix in diffs with characters describing the
+       # context (e.g. "i/"ndex and "w/"ork tree).
+       mnemonicprefix = true
+
        # Change the definition of a word as used by diff --color-words to be
        # shorter (not only spaces) and thus simplify the generated diffs.
        # Words ([a-zA-Z0-9_]+) are matched, or a single non-word character
@@ -194,6 +201,8 @@
 [log]
        # Display branches/tag names in log (same as log's --decorate option).
        decorate = short
+       # If a single file is given to `git log`, automatically use --follow.
+       follow = yes
 
 [merge]
        tool = vimdiff