gitignore: update

[home.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index cda322ae87937f2ad668714354ed6659f9b1a09d..41262e65b8e9fb511429ff55d775caf7287f825e 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -18,17 +18,19 @@
        a    = add
        ab   = abandon
        ar   = archive
-       b    = branch
+       b    = branch -v
        bi   = bisect
        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
@@ -49,5 +51,6 @@
        autosquash = true
 [sendemail]
        chainreplyto = false
+       confirm = always
        suppressfrom = true
        smtpserver = localhost:1111