gitignore: update

[home.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 4a1af8af7688f8458d0d8fbf616d69a205a7ffdd..41262e65b8e9fb511429ff55d775caf7287f825e 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -17,19 +17,24 @@
 [alias]
        a    = add
        ab   = abandon
-       b    = branch
+       ar   = archive
+       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
+       fp   = format-patch -C -M
+       g    = grep
+       h    = help
        l    = log
        m    = merge
-       rb   = rebase
+       rb   = rebase --committer-date-is-author-date
        rb-a = rebase --abort
        rb-c = rebase --continue
        rb-i = rebase --interactive
@@ -46,6 +51,6 @@
        autosquash = true
 [sendemail]
        chainreplyto = false
+       confirm = always
        suppressfrom = true
        smtpserver = localhost:1111
-#      smtpserver = zeus.spd.analog.com