~mdw
/
profile
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
el/dot-emacs.el: Fix conflict between face and overlay variable names.
[profile]
/
dot
/
gitconfig.in
diff --git
a/dot/gitconfig.in
b/dot/gitconfig.in
index
b682839
..
1dbc92b
100644
(file)
--- a/
dot/gitconfig.in
+++ b/
dot/gitconfig.in
@@
-18,6
+18,7
@@
[merge]
summary = true
tool = emerge
[merge]
summary = true
tool = emerge
+ conflictStyle = diff3
[mergetool "emerge"]
path = emerge-hack
[mergetool "emerge"]
path = emerge-hack
@@
-39,6
+40,7
@@
[push]
default = matching
[push]
default = matching
+ followTags = true
[format]
headers = "Organization: Straylight/Edgeware\n"
[format]
headers = "Organization: Straylight/Edgeware\n"