X-Git-Url: http://club.cc.cmu.edu/~cmccabe/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=.gitconfig;h=f71b8319eb6daabf9a72fb12afff8343e243f1f3;hb=HEAD;hp=58415245115d73535f9e05c5938fd05e5c6667bd;hpb=dedd3b7b70a0a18cfb8949a478fe5f433ad3d5cf;p=cmccabe-etc diff --git a/.gitconfig b/.gitconfig index 5841524..f71b831 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,9 +1,8 @@ [core] editor = vim - pager = less -FRX -[user] - name = Colin Patrick McCabe - email = cmccabe@alumni.cmu.edu + pager = less -FRX + autocrlf = false + ignorecase = false [color] branch = auto status = auto @@ -18,8 +17,22 @@ 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/ +[merge] + conflictstyle = diff3 + tool = vimdiff +[branch] + autosetuprebase = always +[user] + email = cmccabe@apache.org + name = Colin P. McCabe