From: Rudolf Polzer Date: Wed, 20 Jan 2010 10:08:35 +0000 (+0100) Subject: support remote branches X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9568d540c380f9ca0529285ee00bf818124e9238;p=xonotic%2Fdiv0-gittools.git support remote branches --- diff --git a/git-update-octopus b/git-update-octopus index 50217f2..395df0b 100755 --- a/git-update-octopus +++ b/git-update-octopus @@ -2,7 +2,7 @@ git log --format=raw | while IFS= read -r L; do case "$L" in - ' Merge branches '*) + ' Merge branches '*|' Merge remote branches '*) b=`echo "$L" | sed -e "s/[^']*'\?\([^']*\)'\?/\1 /g"` git merge $b break