[merge]
summary = true
tool = emerge
+ conflictStyle = diff3
[mergetool "emerge"]
path = emerge-hack
[log]
date = rfc
decorate = true
+ follow = true
+ mailmap = true
[rebase]
autosquash = true
[push]
default = matching
+ followTags = true
[format]
headers = "Organization: Straylight/Edgeware\n"
[color "grep"]
external = --color=always
+[pager]
+ log = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less
+ show = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less
+ diff = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less
+
[alias]
egrep = "grep -E"
patch = "format-patch -o p -s"