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
[rebase]
autosquash = true
+[pull]
+ rebase = false
+
[push]
- default = matching
+ default = upstream
followTags = true
[format]
local = normal
remote = cyan
-[color "grep"]
- external = --color=always
-
[column]
ui = auto column dense
[pager]
- log = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | mdw-pager
- show = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | mdw-pager
- diff = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | mdw-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 ' \
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"