use -M/-C when sending e-mails

[home.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 692ff6538a637b291ca93b9d12c8c5d1dbf78060..fab891054390d0a9ba5e8fb607e85d2ef0358f4c 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -17,6 +17,7 @@
 [alias]
        a    = add
        b    = branch
+       bi   = bisect
        ci   = commit
        co   = checkout
        cp   = cherry-pick
@@ -31,8 +32,14 @@
        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
+[merge]
+       conflictstyle = diff3
+[rebase]
+       autosquash = true
 [sendemail]
        chainreplyto = false
        suppressfrom = true