X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/f444229a67edd550bc091e376c92f203f5c1faae..253f61b46421fbab8407131635f7bbab739a322a:/gitconfig diff --git a/gitconfig b/gitconfig index d74e60b..1f002ca 100644 --- a/gitconfig +++ b/gitconfig @@ -1,3 +1,6 @@ +### -*-conf-*- +### Git configuration + [core] filemode = true excludesfile = @gitignore@ @@ -24,6 +27,7 @@ diff = auto status = auto branch = auto + interactive = auto [color "diff"] plain = normal @@ -49,18 +53,30 @@ patch = "format-patch -o p -s" release = !"sh -e -c ' \ [ $# -gt 0 ] || { \ - echo >&2 \"usage: git release [OPTS] TAG\"; \ + echo >&2 \"usage: git release TAG [OPTS]\"; \ exit 1; \ }; \ - ver=$(eval echo \"\\$$#\"); \ - git tag -as -m \"Release $ver.\" \"$@\"' release" + 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