force disable autorepeat on stupid keys

[home.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index e4af168e3ec4bf412985a404902c9c237293bd99..fb128a2092a8bd50b809b57221a2c6b12a8e8270 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -34,6 +34,9 @@
        rl   = rev-list
        se   = send-email
        st   = status
+       t    = tag
+[merge]
+       conflictstyle = diff3
 [sendemail]
        chainreplyto = false
        suppressfrom = true