projects
/
xonotic
/
div0-gittools.git
/ blob
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
history
|
raw
|
HEAD
call merge tool properly
[xonotic/div0-gittools.git]
/
git-update-octopus
1
#!/bin/sh
2
3
git log --format=raw | while IFS= read -r L; do
4
case "$L" in
5
' Merge branches '*|' Merge remote branches '*)
6
b=`echo "$L" | sed -e "s/[^']*'\?\([^']*\)'\?/\1 /g"`
7
git merge $b
8
break
9
;;
10
esac
11
done