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

diff --git a/dot/gitconfig.in b/dot/gitconfig.in
index 69cca7f..9a55627 100644
--- a/dot/gitconfig.in
+++ b/dot/gitconfig.in
@@ -80,9 +80,6 @@
 	local = normal
 	remote = cyan
 
-[color "grep"]
-	external = --color=always
-
 [column]
 	ui = auto column dense
 
@@ -108,6 +105,18 @@
 		  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"