X-Git-Url: https://defaria.com/gitweb/?a=blobdiff_plain;f=rc%2Fgitconfig;h=b77e7e2748fbe187e7c9b5712c0a55fcbdf60cd5;hb=46fc1400c855e5b0b180e5cad894edbe696088ac;hp=b2f74bdac1e4183171c12372ea7e814d7db603c8;hpb=1a3d0aee95aee5cc91b78d17225870df9bcacb68;p=clearscm.git diff --git a/rc/gitconfig b/rc/gitconfig index b2f74bd..b77e7e2 100644 --- a/rc/gitconfig +++ b/rc/gitconfig @@ -1,6 +1,6 @@ [user] name = Andrew DeFaria - email = Andrew@DeFaria.com + email = A.DeFaria@cpanel.net [pack] windowMemory=128m @@ -11,7 +11,7 @@ pager = less -RX packedGitLimit=128m packedGitWindowSize=128m - excludesfile = /home/andrew/.gitignore + excludesfile = ~/.gitignore [color] status=auto @@ -55,8 +55,12 @@ [push] default = simple [http] - sslVerify = false + sslVerify = false [credential] - helper = store --file ~/.git-credentials + helper = store --file ~/.git-credentials [pull] - rebase = false + rebase = false +[merge] + tool = meld +[mergetoo "meld"] + cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"