r: handle --draft

[home.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index e4af168e3ec4bf412985a404902c9c237293bd99..d04afbd2211a60ecb4aa42f4188c98e2b3749ad7 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -16,26 +16,39 @@
        default = current
 [alias]
        a    = add
-       b    = branch
+       ab   = abandon
+       ar   = archive
+       b    = branch -v
        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
+       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
        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
+       confirm = always
        suppressfrom = true
        smtpserver = localhost:1111
-#      smtpserver = zeus.spd.analog.com