dot-emacs: Turn on gtags mode in general.

[profile] / gitconfig

diff --git a/gitconfig b/gitconfig
index 1e9c706..1f002ca 100644 (file)
--- a/gitconfig
+++ b/gitconfig
@@ -1,12 +1,21 @@
+### -*-conf-*-
+### Git configuration
+
 [core]
        filemode = true
+       excludesfile = @gitignore@
 
 [user]
        name = Mark Wooding
-       email = <mdw@distorted.org.uk>
+       email = mdw@distorted.org.uk
+       signingkey = @releasekey@
 
 [merge]
        summary = true
+       tool = emerge
+
+[mergetool "emerge"]
+       path = emerge-hack
 
 [diff]
        renames = copies
@@ -18,12 +27,13 @@
        diff = auto
        status = auto
        branch = auto
+       interactive = auto
 
 [color "diff"]
        plain = normal
        meta = bold
-       new = bold green
-       old = bold red
+       new = green
+       old = red
        commit = bold yellow
        whitespace = reverse red
 
@@ -41,8 +51,45 @@
 [alias]
        egrep = "grep -E"
        patch = "format-patch -o p -s"
+       release = !"sh -e -c ' \
+               [ $# -gt 0 ] || { \
+                 echo >&2 \"usage: git release TAG [OPTS]\"; \
+                 exit 1; \
+               }; \
+               git tag -as -m \"Release $1.\" \"$@\"' release"
+       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)}; \
+               if [ $# -eq 0 ]; then set -- \"$(stg branch)\"; fi; \
+               for branch; do \
+                 rmdir \"$GIT_DIR/patches/$branch/patches\"; \
+                 rm -rf \"$GIT_DIR/patches/$branch\"; \
+                 git for-each-ref -s \
+                   --format \"git update-ref -d %(refname) %(objectname)\" \
+                   \"refs/patches/$branch\" \"refs/bases/$branch\" | \
+                   sh -e; \
+               done' unstg"
+
+[stgit]
+       autoresolved = yes
+       smtpdelay = 0
+
+[mail "alias"]
+       git = git@vger.kernel.org
+       mdw = mdw@distorted.org.uk
+
+[sendemail]
+       chainreplyto = no
+       signedoffcc = yes
+
+[gui]
+       fontui = -family Sans -size 10
+       fontdiff = -family MiscFixed6x13 -size 10