projects
/
clearscm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed to not try new images while the monitor is off
[clearscm.git]
/
rc
/
gitconfig
diff --git
a/rc/gitconfig
b/rc/gitconfig
index
2d54e48
..
719fcef
100644
(file)
--- a/
rc/gitconfig
+++ b/
rc/gitconfig
@@
-17,6
+17,15
@@
diff=auto
branch=auto
diff=auto
branch=auto
+[diff]
+ tool = meld
+
+[difftool]
+ prompt = false
+
+[difftool "meld"]
+ cmd = meld "$LOCAL" "$REMOTE"
+
# Currently these are restating the default
[color "branch"]
current=green
# Currently these are restating the default
[color "branch"]
current=green
@@
-24,7
+33,7
@@
remote=red
[color "diff"]
remote=red
[color "diff"]
- external = /
usr/local/bin/git-
meld
+ external = /
bin/
meld
[color "status"]
added=yellow
[color "status"]
added=yellow
@@
-44,3
+53,5
@@
[push]
default = simple
[push]
default = simple
+[http]
+ sslVerify = false