emacs: Keep the bookmarks file up to date.

[profile] / gitconfig

diff --git a/gitconfig b/gitconfig
index 7ef9adf..474becc 100644 (file)
--- a/gitconfig
+++ b/gitconfig
@@ -1,10 +1,11 @@
 [core]
        filemode = true
+       excludesfile = @gitignore@
 
 [user]
        name = Mark Wooding
        email = mdw@distorted.org.uk
-       signingkey = 0x838424481371BE1B22ECB4C545510A46481334C2
+       signingkey = @releasekey@
 
 [merge]
        summary = true
@@ -27,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
 
@@ -47,9 +48,13 @@
        egrep = "grep -E"
        patch = "format-patch -o p -s"
        release = !"sh -e -c ' \
-               ver=${1?version}; \
-               shift; \
-               git tag -as "$@" -m \"Release $ver.\" \"$ver\"' release"
+               [ $# -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 \