Merge remote-tracking branch 'staging'

[profile] / dot / gitconfig.in

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index 47fa3920869aaed796ee3c3ed62d7b7eda91ea54..0bc63d1c87e3f36861973d3a09557ae7fc96f6ad 100644 (file)
--- a/dot/gitconfig.in
+++ b/dot/gitconfig.in
@@ -12,9 +12,13 @@
        email = mdw@distorted.org.uk
        signingkey = @releasekey@
 
+[annex]
+       sshcaching = false
+
 [merge]
        summary = true
        tool = emerge
+       conflictStyle = diff3
 
 [mergetool "emerge"]
        path = emerge-hack
@@ -30,12 +34,21 @@
 [log]
        date = rfc
        decorate = true
+       follow = true
+       mailmap = true
 
 [rebase]
        autosquash = true
 
+[push]
+       default = matching
+       followTags = true
+
 [format]
        headers = "Organization: Straylight/Edgeware\n"
+       coverletter = auto
+       thread = shallow
+       signature = "[mdw]"
 
 [color]
        ui = auto
@@ -68,9 +81,14 @@
 [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"
+       patches = "format-patch --full-index"
        graph = "log --pretty=oneline --abbrev-commit --graph"
        release = !"sh -e -c ' \
                [ $# -gt 0 ] || { \
@@ -81,11 +99,6 @@
        amend = !"env EDITOR=true VISUAL=true git commit --amend -a"
        spaces = !"sh -e -c 'git ls-files -z \"$@\"| \
                xargs -0r space -cv' spaces"
-       mailto = "send-email \
-                       --quiet \
-                       --no-chain-reply-to \
-                       --no-signed-off-by-cc \
-                       --to"
        files = "ls-files --exclude-standard"
        unstg = !"sh -e -c ' \
                : ${GIT_DIR=$(git rev-parse --git-dir)}; \
@@ -116,9 +129,13 @@
        aliasesfile = @profile@/dot/mailrc
        aliasfiletype = mailrc
        chainreplyto = no
+       thread = no
        signedoffbycc = yes
        suppresscc = self
 
 [gui]
        fontui = -family Sans -size 10
-       fontdiff = -family MiscFixed6x13 -size 10
+       fontdiff = -family Fixed -size 13
+
+[http]
+       cookiefile = @home@/.gitcookies