gitconfig: add cp alias (git cherry-pick)

[config/dotfiles.git] / gitconfig.in

diff --git a/gitconfig.in b/gitconfig.in
index 00045f4951e2c0a9620e908643a1de0c51c07085..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.
@@ -226,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