.gitconfig: reindent, set merge-tool vimdiff

diff --git a/.gitconfig b/.gitconfig
index 423382a..6a1d62a 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,6 +1,6 @@
 [core]
        editor = vim
-        pager = less -FRX
+       pager = less -FRX
        autocrlf = false
 [color]
        branch = auto
@@ -16,18 +16,19 @@
        smtpencryption = tls
        smtpuser = rarecactus@gmail.com
 [imap]
-        folder = "[Gmail]/Drafts"
-        host = imaps://imap.gmail.com
-        user = rarecactus@gmail.com
-        port = 993
-        sslverify = false
+       folder = "[Gmail]/Drafts"
+       host = imaps://imap.gmail.com
+       user = rarecactus@gmail.com
+       port = 993
+       sslverify = false
 [push]
        default = current
-[reviewboard] 
-       url = http://review.sf.cloudera.com/ 
-[url "git@github.sf.cloudera.com:"]
-       pushInsteadOf = git://github.sf.cloudera.com/
+#[reviewboard]
+       #url = http://review.sf.cloudera.com/
+#[url "git@github.sf.cloudera.com:"]
+       #pushInsteadOf = git://github.sf.cloudera.com/
 [merge]
        conflictstyle = diff3
+       tool = vimdiff
 [branch]
        autosetuprebase = always