force disable autorepeat on stupid keys

[home.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 25d7421bb49749649efe100948625c89c866c2cb..fb128a2092a8bd50b809b57221a2c6b12a8e8270 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -17,6 +17,8 @@
 [alias]
        a    = add
        b    = branch
+       bi   = bisect
+       ci   = commit
        co   = checkout
        cp   = cherry-pick
        d    = diff
@@ -32,6 +34,9 @@
        rl   = rev-list
        se   = send-email
        st   = status
+       t    = tag
+[merge]
+       conflictstyle = diff3
 [sendemail]
        chainreplyto = false
        suppressfrom = true