]> git.wh0rd.org - home.git/commitdiff
git.wh0rd.org / home.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: be52646)
gitconfig: use --ff with cp by default
authorMike Frysinger <vapier@gentoo.org>
Wed, 24 Sep 2014 22:36:10 +0000 (18:36 -0400)
committerMike Frysinger <vapier@gentoo.org>
Wed, 24 Sep 2014 22:43:36 +0000 (17:43 -0500)
.gitconfig patch | blob | blame | history

diff --git a/.gitconfig b/.gitconfig
index 11254a1d7a6fb203bbe4c492685616090eeceb68..50980b7e67a7892066bf9e65b34ed695d117a524 100644 (file)
--- 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
my ~/