From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 24 Sep 2014 22:36:10 +0000 (-0400)
Subject: gitconfig: use --ff with cp by default
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=c725b573aa752778315d9dbab5ba0a1b50dcc7e6;p=home.git

gitconfig: use --ff with cp by default
---

diff --git a/.gitconfig b/.gitconfig
index 11254a1..50980b7 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -23,7 +23,7 @@
 	cfg  = config
 	ci   = commit
 	co   = checkout
-	cp   = cherry-pick
+	cp   = cherry-pick --ff
 	d    = diff
 	desc = describe
 	dl   = download