also use -C -M with format-patch

[home.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index f17feb867157c8d0c8447217909d1e62032ad817..77ab2cc1d1f17e0c2aef266cf6da0f91f2628e9d 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -16,14 +16,19 @@
        default = current
 [alias]
        a    = add
+       ab   = abandon
+       ar   = archive
        b    = branch
        bi   = bisect
+       cfg  = config
        ci   = commit
        co   = checkout
        cp   = cherry-pick
        d    = diff
+       desc = describe
+       dl   = download
        f    = fetch
-       fp   = format-patch
+       fp   = format-patch -C -M
        l    = log
        m    = merge
        rb   = rebase
@@ -32,11 +37,16 @@
        rb-i = rebase --interactive
        rb-s = rebase --skip
        rl   = rev-list
-       se   = send-email
+       se   = send-email -C -M
+       sm   = submodule
        st   = status
        t    = tag
+       up   = upload
+[merge]
+       conflictstyle = diff3
+[rebase]
+       autosquash = true
 [sendemail]
        chainreplyto = false
        suppressfrom = true
        smtpserver = localhost:1111
-#      smtpserver = zeus.spd.analog.com