Merge remote-tracking branch 'staging'

[profile] / dot / gitconfig.in

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index 78672d1708e0d040ebc92700b97dc47032a1e87e..0bc63d1c87e3f36861973d3a09557ae7fc96f6ad 100644 (file)
--- a/dot/gitconfig.in
+++ b/dot/gitconfig.in
@@ -4,31 +4,51 @@
 [core]
        filemode = true
        excludesfile = @profile@/git/gitignore
+       attributesfile = @profile@/git/attributes
+       whitespace = trailing-space,space-before-tab,indent-with-non-tab
 
 [user]
        name = Mark Wooding
        email = mdw@distorted.org.uk
        signingkey = @releasekey@
 
+[annex]
+       sshcaching = false
+
 [merge]
        summary = true
        tool = emerge
+       conflictStyle = diff3
 
 [mergetool "emerge"]
        path = emerge-hack
 
 [diff]
        renames = copies
+       renameLimit = 1024
+       wordRegex = [[:alnum:]]+|[^[:space:][:alnum:]]
 
 [diff "lisp"]
-       xfuncname = "^\\s*\\(def.*$"
+       xfuncname = "^((\\(|\\s*\\(def).*$)"
 
 [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
@@ -42,10 +62,10 @@
        whitespace = reverse red
 
 [color "interactive"]
-        prompt = bold yellow
-        header = bold
-        help = green
-        error = bold red
+       prompt = bold yellow
+       header = bold
+       help = green
+       error = bold red
 
 [color "status"]
        header = bold
@@ -61,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 ] || { \
@@ -74,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)}; \
@@ -94,6 +114,7 @@
 
 [rerere]
        enabled = yes
+       autoupdate = yes
 
 [stgit]
        autoresolved = yes
@@ -108,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