r: handle --draft

[home.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index c4f10dee9eb5397020eca01aaf3846ba87152f31..d04afbd2211a60ecb4aa42f4188c98e2b3749ad7 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -14,8 +14,41 @@
        meta = magenta
 [push]
        default = current
+[alias]
+       a    = add
+       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 -C -M
+       h    = help
+       l    = log
+       m    = merge
+       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 -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