Merge branch 'master' into fairchild

[profile] / dot / gitconfig.in

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index 9b9617767963eabe1f59cc96f03a9f7c1d8e8f9c..369c091acc051e50501d4bb27a6b227e25a744d0 100644 (file)
--- a/dot/gitconfig.in
+++ b/dot/gitconfig.in
@@ -46,6 +46,9 @@
 
 [format]
        headers = "Organization: Straylight/Edgeware\n"
+       coverletter = auto
+       thread = shallow
+       signature = "[mdw]"
 
 [color]
        ui = auto
@@ -85,7 +88,7 @@
 
 [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 ] || { \
@@ -96,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)}; \
@@ -131,6 +129,7 @@
        aliasesfile = @profile@/dot/mailrc
        aliasfiletype = mailrc
        chainreplyto = no
+       thread = no
        signedoffbycc = yes
        suppresscc = self