projects
/
clearscm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Various updates from DEV
[clearscm.git]
/
rc
/
gitconfig
diff --git
a/rc/gitconfig
b/rc/gitconfig
index
b2f74bd
..
13ba678
100644
(file)
--- a/
rc/gitconfig
+++ b/
rc/gitconfig
@@
-11,7
+11,7
@@
pager = less -RX
packedGitLimit=128m
packedGitWindowSize=128m
pager = less -RX
packedGitLimit=128m
packedGitWindowSize=128m
-
excludesfile = /home/andrew/.gitignore
+ excludesfile = /home/andrew/.gitignore
[color]
status=auto
[color]
status=auto
@@
-55,8
+55,12
@@
[push]
default = simple
[http]
[push]
default = simple
[http]
-
sslVerify = false
+ sslVerify = false
[credential]
[credential]
-
helper = store --file ~/.git-credentials
+ helper = store --file ~/.git-credentials
[pull]
[pull]
- rebase = false
+ rebase = false
+[merge]
+ tool = meld
+[mergetoo "meld"]
+ cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"