4 if ( test $1="" ); then
10 CURBRANCH
=`currentbranchname`
11 if ( git status|
grep ".dotest/" ); then
12 if ( git status|
grep "# Changed but not updated:" ); then
13 echo "Please edit these unmerged files and run endbranch again:"
14 git status|
grep unmerged|cut
-d" " -f4-
16 if ( git status|
grep "# Changes to be committed:" ); then
17 echo "Apply conflict resolutions..."
20 echo "Moving forward with HEAD..."
25 git rebase
$TARGET_BRANCH
26 if ( git status|
grep "nothing to commit (working directory clean)" ); then
27 echo "Rebasing complete."
29 echo "Please edit these unmerged files and run endbranch again:"
30 git status|
grep unmerged|cut
-d" " -f4-