emacs: Keep the bookmarks file up to date.

[profile] / gitconfig

diff --git a/gitconfig b/gitconfig
index 13c8830..474becc 100644 (file)
--- a/gitconfig
+++ b/gitconfig
@@ -1,12 +1,18 @@
 [core]
        filemode = true
+       excludesfile = @gitignore@
 
 [user]
        name = Mark Wooding
        email = mdw@distorted.org.uk
+       signingkey = @releasekey@
 
 [merge]
        summary = true
+       tool = emerge
+
+[mergetool "emerge"]
+       path = emerge-hack
 
 [diff]
        renames = copies
@@ -22,8 +28,8 @@
 [color "diff"]
        plain = normal
        meta = bold
-       new = bold green
-       old = bold red
+       new = green
+       old = red
        commit = bold yellow
        whitespace = reverse red
 
@@ -41,12 +47,28 @@
 [alias]
        egrep = "grep -E"
        patch = "format-patch -o p -s"
+       release = !"sh -e -c ' \
+               [ $# -gt 0 ] || { \
+                 echo >&2 \"usage: git release [OPTS] TAG\"; \
+                 exit 1; \
+               }; \
+               ver=$(eval echo \"\\$$#\"); \
+               git tag -as -m \"Release $ver.\" \"$@\"' release"
+       amend = !"env EDITOR=true VISUAL=true git commit --amend -a"
        mailto = "send-email \
                        --quiet \
                        --no-chain-reply-to \
                        --no-signed-off-by-cc \
                        --to"
 
+[stgit]
+       autoresolved = yes
+       smtpdelay = 0
+
 [mail "alias"]
        git = git@vger.kernel.org
        mdw = mdw@distorted.org.uk
+
+[gui]
+       fontui = -family helvetica -size 11 -weight normal -slant roman -underline 0 -overstrike 0
+       fontdiff = -family fixed -size 10 -weight normal -slant roman -underline 0 -overstrike 0