From 766ea174975632397ad16d90321941f2c2db6bf8 Mon Sep 17 00:00:00 2001 From: Colin P. Mccabe Date: Sun, 25 Dec 2016 20:58:46 -0800 Subject: [PATCH] .gitconfig: reindent, set merge-tool vimdiff --- .gitconfig | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.gitconfig b/.gitconfig index 423382a..6a1d62a 100644 --- 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 -- 1.6.6.rc1.39.g9a42