ddnuke: document error case better

[home.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 11254a1d7a6fb203bbe4c492685616090eeceb68..41262e65b8e9fb511429ff55d775caf7287f825e 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -23,7 +23,8 @@
        cfg  = config
        ci   = commit
        co   = checkout
-       cp   = cherry-pick
+       cp   = cherry-pick --ff
+       cp-x = cherry-pick -x
        d    = diff
        desc = describe
        dl   = download