~mdw
/
profile
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dot/emacs: Fix paragraph comment style.
[profile]
/
dot
/
gitconfig.in
diff --git
a/dot/gitconfig.in
b/dot/gitconfig.in
index
b682839
..
2bbe464
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
@@
-33,12
+34,15
@@
[log]
date = rfc
decorate = true
[log]
date = rfc
decorate = true
+ follow = true
+ mailmap = true
[rebase]
autosquash = true
[push]
default = matching
[rebase]
autosquash = true
[push]
default = matching
+ followTags = true
[format]
headers = "Organization: Straylight/Edgeware\n"
[format]
headers = "Organization: Straylight/Edgeware\n"