]> git.xonotic.org Git - xonotic/div0-gittools.git/commitdiff
git-update-octopus
authorRudolf Polzer <rpolzer@nb-04.(none)>
Tue, 19 Jan 2010 11:08:31 +0000 (12:08 +0100)
committerRudolf Polzer <rpolzer@nb-04.(none)>
Tue, 19 Jan 2010 11:08:31 +0000 (12:08 +0100)
git-update-octopus [new file with mode: 0755]

diff --git a/git-update-octopus b/git-update-octopus
new file mode 100755 (executable)
index 0000000..50217f2
--- /dev/null
@@ -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