gitconfig: add cp alias (git cherry-pick)

[config/dotfiles.git] / gitconfig.in

diff --git a/gitconfig.in b/gitconfig.in
index 99ffe299d42d532c77424d72a9f6f34c88eb985f..5058769b9359865118fbd8944aa94d1b2625db39 100644 (file)
--- a/gitconfig.in
+++ b/gitconfig.in
@@ -97,6 +97,7 @@
        re  = rebase
        rei = rebase --interactive
        rec = rebase --continue
+       cp  = cherry-pick
        ## Submodules.
        sm  = submodule
        ## Remote.
@@ -172,6 +173,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
@@ -222,4 +227,11 @@
        # receive-pack and git fetch (>= 1.7.8, for fetch)).
        fsckObjects = yes
 
+
+# NON-GIT SETTINGS
+
+[annex]
+       # My SSH config already uses ControlMaster where appropriate.
+       sshcaching = false
+
 # vim: ft=gitconfig