### -*-conf-*- ### Git configuration [core] filemode = true excludesfile = @profile@/git/gitignore attributesfile = @profile@/git/attributes whitespace = trailing-space,space-before-tab,indent-with-non-tab [advice] ignoredHook = false [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).*$)" [log] date = rfc decorate = true follow = true mailmap = true [rebase] autosquash = true [pull] rebase = false [push] default = upstream followTags = true [format] headers = "Organization: Straylight/Edgeware\n" from = Mark Wooding <@email@> coverletter = auto thread = shallow signature = "[mdw]" outputdirectory = p/ [color] ui = auto [color "diff"] plain = normal meta = bold new = green old = red commit = bold yellow whitespace = reverse red [color "interactive"] prompt = bold yellow header = bold help = green error = bold red [color "status"] header = bold added = bold green changed = bold blue untracked = bold red [color "branch"] current = bold local = normal remote = cyan [column] ui = auto column dense [pager] diff = "if type >/dev/null 2>&1 diff-highlight; then diff-highlight; else cat; fi | mdw-pager" log = "if type >/dev/null 2>&1 diff-highlight; then diff-highlight; else cat; fi | mdw-pager" show = "if type >/dev/null 2>&1 diff-highlight; then diff-highlight; else cat; fi | mdw-pager" [alias] do = "!sh -e -c ' \ quiet=; \ case $#,$1 in 0, | *,*,*) ;; *,-q) quiet=--quiet; shift ;; esac; \ case $quiet in ?*) ;; *) echo \"Entering toplevel\" ;; esac; \ (name=\"\"; path=.; toplevel=$(pwd); \ sha1=$(git rev-parse HEAD); \ set +e; case $# in 1) eval \"$1\" ;; *) \"$@\" ;; esac); \ exec git submodule $quiet foreach --recursive \"$@\"' do" egrep = "grep -E" graph = "log --pretty=oneline --abbrev-commit --graph" release = !"sh -e -c ' \ [ $# -gt 0 ] || { \ echo >&2 \"usage: git release TAG [OPTS]\"; \ exit 1; \ }; \ git tag -as -m \"Release $1.\" \"$@\"' release" catchup = !"perl -e ' \ use autodie qw(:all); \ if (@ARGV < 2) { \ print STDERR \"git catchup REMOTE REF ...\n\"; \ exit 2; \ } \ @c = (); $m = shift @ARGV; \ for my $r (@ARGV) { \ my ($p, $r) = $r =~ /^([+]*)(.*)$/; \ push @c, \"$p$m/$r:$r\"; \ } \ exec \"git\", \"push\", \".\", @c'" amend = !"env EDITOR=true VISUAL=true git commit --amend -a" spaces = !"sh -e -c 'git ls-files -z \"$@\"| \ xargs -0r space -cv' spaces" 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" [rerere] enabled = yes autoupdate = yes [stgit] autoresolved = yes smtpdelay = 0 [mail "alias"] git = git@vger.kernel.org mdw = mdw@distorted.org.uk [sendemail] from = Mark Wooding aliasesfile = @profile@/dot/mailrc aliasfiletype = mailrc chainreplyto = no thread = no signedoffbycc = yes suppresscc = self [mailinfo] scissors = true [gui] fontui = -family Sans -size 10 fontdiff = -family Fixed -size 13 [http] cookiefile = @home@/.gitcookies