gitconfig: use --ff with cp by default

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