dot/shell-rc: Only deploy the trivial prompt if not directly under Emacs.

[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
+       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"