dot/zshrc: Recognize the keypad keys.

[profile] / dot / gitconfig.in

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index 8dd1f90953ed122aec2c2fd64173157825656c24..2bbe46482054ca90bd6f2756ae1f07dc1bb85dad 100644 (file)
--- a/dot/gitconfig.in
+++ b/dot/gitconfig.in
@@ -18,6 +18,7 @@
 [merge]
        summary = true
        tool = emerge
+       conflictStyle = diff3
 
 [mergetool "emerge"]
        path = emerge-hack
@@ -33,12 +34,15 @@
 [log]
        date = rfc
        decorate = true
+       follow = true
+       mailmap = true
 
 [rebase]
        autosquash = true
 
 [push]
        default = matching
+       followTags = true
 
 [format]
        headers = "Organization: Straylight/Edgeware\n"
@@ -74,6 +78,11 @@
 [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"