diff --git a/git/gitconfig.j2 b/git/gitconfig.j2
index 21adcef..d7255fa 100644
--- a/git/gitconfig.j2
+++ b/git/gitconfig.j2
@@ -62,6 +62,9 @@
 
     exec = "!exec "
 
+    cp = "cherry-pick"
+    cpa = "cherry-pick --abort"
+
 [core]
     fileMode = true
     whitespace = "blank-at-eol,space-before-tab,blank-at-eof"