ddnuke: document error case better

[home.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index d04afbd2211a60ecb4aa42f4188c98e2b3749ad7..41262e65b8e9fb511429ff55d775caf7287f825e 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -23,12 +23,14 @@
        cfg  = config
        ci   = commit
        co   = checkout
-       cp   = cherry-pick
+       cp   = cherry-pick --ff
+       cp-x = cherry-pick -x
        d    = diff
        desc = describe
        dl   = download
        f    = fetch
        fp   = format-patch -C -M
+       g    = grep
        h    = help
        l    = log
        m    = merge