Merge remote-tracking branch 'staging/master'

[profile] / dot / gitconfig.in

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index 0bc63d1..9d95d2a 100644 (file)
--- a/dot/gitconfig.in
+++ b/dot/gitconfig.in
@@ -46,9 +46,11 @@
 
 [format]
        headers = "Organization: Straylight/Edgeware\n"
+       from = Mark Wooding <@email@>
        coverletter = auto
        thread = shallow
        signature = "[mdw]"
+       outputdirectory = p/
 
 [color]
        ui = auto
@@ -81,14 +83,16 @@
 [color "grep"]
        external = --color=always
 
+[column]
+       ui = auto column dense
+
 [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
+       log = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | mdw-pager
+       show = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | mdw-pager
+       diff = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | mdw-pager
 
 [alias]
        egrep = "grep -E"
-       patches = "format-patch --full-index"
        graph = "log --pretty=oneline --abbrev-commit --graph"
        release = !"sh -e -c ' \
                [ $# -gt 0 ] || { \
@@ -133,6 +137,9 @@
        signedoffbycc = yes
        suppresscc = self
 
+[mailinfo]
+       scissors = true
+
 [gui]
        fontui = -family Sans -size 10
        fontdiff = -family Fixed -size 13