X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/e6a7e588f9a3abdcdb6cb031dc56ca7795814c50..e623f04118295c92c75eacaed5c50ce72fd108b6:/dot/gitconfig.in

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index 8dd1f90..9a55627 100644
--- a/dot/gitconfig.in
+++ b/dot/gitconfig.in
@@ -18,6 +18,7 @@
 [merge]
 	summary = true
 	tool = emerge
+	conflictStyle = diff3
 
 [mergetool "emerge"]
 	path = emerge-hack
@@ -33,15 +34,23 @@
 [log]
 	date = rfc
 	decorate = true
+	follow = true
+	mailmap = true
 
 [rebase]
 	autosquash = true
 
 [push]
 	default = matching
+	followTags = true
 
 [format]
 	headers = "Organization: Straylight/Edgeware\n"
+	from = Mark Wooding <@email@>
+	coverletter = auto
+	thread = shallow
+	signature = "[mdw]"
+	outputdirectory = p/
 
 [color]
 	ui = auto
@@ -71,12 +80,24 @@
 	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
 
 [alias]
+	do = "!sh -e -c ' \
+		quiet=; \
+		case $#,$1 in 0, | *,*,*) ;; *,-q) quiet=--quiet; shift ;; esac; \
+		case $quiet in ?*) ;; *) echo \"Entering toplevel\" ;; esac; \
+		(name=\"<toplevel>\"; 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"
-	patch = "format-patch -o p -s"
 	graph = "log --pretty=oneline --abbrev-commit --graph"
 	release = !"sh -e -c ' \
 		[ $# -gt 0 ] || { \
@@ -84,14 +105,21 @@
 		  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"
-	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)}; \
@@ -122,9 +150,13 @@
 	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