git-update-octopus

[xonotic/div0-gittools.git] / git-update-octopus

diff --git a/git-update-octopus b/git-update-octopus
new file mode 100755 (executable)
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