From f6e00ef0a9ea692d3b13cff9ff6d08a0fe2f105c Mon Sep 17 00:00:00 2001
From: Rudolf Polzer <rpolzer@nb-04.(none)>
Date: Tue, 19 Jan 2010 12:08:31 +0100
Subject: [PATCH] git-update-octopus

---
 git-update-octopus | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100755 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
-- 
2.39.2