| 1 | ### -*-conf-*- |
| 2 | ### Git configuration |
| 3 | |
| 4 | [core] |
| 5 | filemode = true |
| 6 | excludesfile = @profile@/git/gitignore |
| 7 | attributesfile = @profile@/git/attributes |
| 8 | whitespace = trailing-space,space-before-tab,indent-with-non-tab |
| 9 | |
| 10 | [user] |
| 11 | name = Mark Wooding |
| 12 | email = mdw@distorted.org.uk |
| 13 | signingkey = @releasekey@ |
| 14 | |
| 15 | [annex] |
| 16 | sshcaching = false |
| 17 | |
| 18 | [merge] |
| 19 | summary = true |
| 20 | tool = emerge |
| 21 | conflictStyle = diff3 |
| 22 | |
| 23 | [mergetool "emerge"] |
| 24 | path = emerge-hack |
| 25 | |
| 26 | [diff] |
| 27 | renames = copies |
| 28 | renameLimit = 1024 |
| 29 | wordRegex = [[:alnum:]]+|[^[:space:][:alnum:]] |
| 30 | |
| 31 | [diff "lisp"] |
| 32 | xfuncname = "^((\\(|\\s*\\(def).*$)" |
| 33 | |
| 34 | [log] |
| 35 | date = rfc |
| 36 | decorate = true |
| 37 | follow = true |
| 38 | mailmap = true |
| 39 | |
| 40 | [rebase] |
| 41 | autosquash = true |
| 42 | |
| 43 | [push] |
| 44 | default = upstream |
| 45 | followTags = true |
| 46 | |
| 47 | [format] |
| 48 | headers = "Organization: Straylight/Edgeware\n" |
| 49 | from = Mark Wooding <@email@> |
| 50 | coverletter = auto |
| 51 | thread = shallow |
| 52 | signature = "[mdw]" |
| 53 | outputdirectory = p/ |
| 54 | |
| 55 | [color] |
| 56 | ui = auto |
| 57 | |
| 58 | [color "diff"] |
| 59 | plain = normal |
| 60 | meta = bold |
| 61 | new = green |
| 62 | old = red |
| 63 | commit = bold yellow |
| 64 | whitespace = reverse red |
| 65 | |
| 66 | [color "interactive"] |
| 67 | prompt = bold yellow |
| 68 | header = bold |
| 69 | help = green |
| 70 | error = bold red |
| 71 | |
| 72 | [color "status"] |
| 73 | header = bold |
| 74 | added = bold green |
| 75 | changed = bold blue |
| 76 | untracked = bold red |
| 77 | |
| 78 | [color "branch"] |
| 79 | current = bold |
| 80 | local = normal |
| 81 | remote = cyan |
| 82 | |
| 83 | [column] |
| 84 | ui = auto column dense |
| 85 | |
| 86 | [pager] |
| 87 | log = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | mdw-pager |
| 88 | show = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | mdw-pager |
| 89 | diff = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | mdw-pager |
| 90 | |
| 91 | [alias] |
| 92 | do = "!sh -e -c ' \ |
| 93 | quiet=; \ |
| 94 | case $#,$1 in 0, | *,*,*) ;; *,-q) quiet=--quiet; shift ;; esac; \ |
| 95 | case $quiet in ?*) ;; *) echo \"Entering toplevel\" ;; esac; \ |
| 96 | (name=\"<toplevel>\"; path=.; toplevel=$(pwd); \ |
| 97 | sha1=$(git rev-parse HEAD); \ |
| 98 | set +e; case $# in 1) eval \"$1\" ;; *) \"$@\" ;; esac); \ |
| 99 | exec git submodule $quiet foreach --recursive \"$@\"' do" |
| 100 | egrep = "grep -E" |
| 101 | graph = "log --pretty=oneline --abbrev-commit --graph" |
| 102 | release = !"sh -e -c ' \ |
| 103 | [ $# -gt 0 ] || { \ |
| 104 | echo >&2 \"usage: git release TAG [OPTS]\"; \ |
| 105 | exit 1; \ |
| 106 | }; \ |
| 107 | git tag -as -m \"Release $1.\" \"$@\"' release" |
| 108 | catchup = !"perl -e ' \ |
| 109 | use autodie qw(:all); \ |
| 110 | if (@ARGV < 2) { \ |
| 111 | print STDERR \"git catchup REMOTE REF ...\n\"; \ |
| 112 | exit 2; \ |
| 113 | } \ |
| 114 | @c = (); $m = shift @ARGV; \ |
| 115 | for my $r (@ARGV) { \ |
| 116 | my ($p, $r) = $r =~ /^([+]*)(.*)$/; \ |
| 117 | push @c, \"$p$m/$r:$r\"; \ |
| 118 | } \ |
| 119 | exec \"git\", \"push\", \".\", @c'" |
| 120 | amend = !"env EDITOR=true VISUAL=true git commit --amend -a" |
| 121 | spaces = !"sh -e -c 'git ls-files -z \"$@\"| \ |
| 122 | xargs -0r space -cv' spaces" |
| 123 | files = "ls-files --exclude-standard" |
| 124 | unstg = !"sh -e -c ' \ |
| 125 | : ${GIT_DIR=$(git rev-parse --git-dir)}; \ |
| 126 | if [ $# -eq 0 ]; then set -- \"$(stg branch)\"; fi; \ |
| 127 | for branch; do \ |
| 128 | rmdir \"$GIT_DIR/patches/$branch/patches\"; \ |
| 129 | rm -rf \"$GIT_DIR/patches/$branch\"; \ |
| 130 | git for-each-ref -s \ |
| 131 | --format \"git update-ref -d %(refname) %(objectname)\" \ |
| 132 | \"refs/patches/$branch\" \"refs/bases/$branch\" | \ |
| 133 | sh -e; \ |
| 134 | done' unstg" |
| 135 | |
| 136 | [rerere] |
| 137 | enabled = yes |
| 138 | autoupdate = yes |
| 139 | |
| 140 | [stgit] |
| 141 | autoresolved = yes |
| 142 | smtpdelay = 0 |
| 143 | |
| 144 | [mail "alias"] |
| 145 | git = git@vger.kernel.org |
| 146 | mdw = mdw@distorted.org.uk |
| 147 | |
| 148 | [sendemail] |
| 149 | from = Mark Wooding <mdw@distorted.org.uk> |
| 150 | aliasesfile = @profile@/dot/mailrc |
| 151 | aliasfiletype = mailrc |
| 152 | chainreplyto = no |
| 153 | thread = no |
| 154 | signedoffbycc = yes |
| 155 | suppresscc = self |
| 156 | |
| 157 | [mailinfo] |
| 158 | scissors = true |
| 159 | |
| 160 | [gui] |
| 161 | fontui = -family Sans -size 10 |
| 162 | fontdiff = -family Fixed -size 13 |
| 163 | |
| 164 | [http] |
| 165 | cookiefile = @home@/.gitcookies |