From: Rudolf Polzer <rpolzer@nb-04.(none)>
Date: Tue, 19 Jan 2010 11:08:31 +0000 (+0100)
Subject: git-update-octopus
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f6e00ef0a9ea692d3b13cff9ff6d08a0fe2f105c;p=xonotic%2Fdiv0-gittools.git

git-update-octopus
---

diff --git a/git-update-octopus b/git-update-octopus
new file mode 100755
index 0000000..50217f2
--- /dev/null
+++ b/git-update-octopus
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+git log --format=raw | while IFS= read -r L; do
+	case "$L" in
+		'    Merge branches '*)
+			b=`echo "$L" | sed -e "s/[^']*'\?\([^']*\)'\?/\1 /g"`
+			git merge $b
+			break
+			;;
+	esac
+done