more words

[home.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 692ff6538a637b291ca93b9d12c8c5d1dbf78060..a62549f7907b59723231f2c82edc791f0a9834f7 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -16,7 +16,10 @@
        default = current
 [alias]
        a    = add
+       ab   = abandon
        b    = branch
+       bi   = bisect
+       cfg  = config
        ci   = commit
        co   = checkout
        cp   = cherry-pick
@@ -31,8 +34,15 @@
        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