rebasebranch

   1 #!/bin/sh
   2 # rebasebranch
   3
   4 if ( test $1="" ); then
   5     TARGET_BRANCH=$1
   6 else
   7         TARGET_BRANCH=master
   8 fi
   9
  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-
  15         else
  16                 if ( git status|grep "# Changes to be committed:" ); then
  17                         echo "Apply conflict resolutions..."
  18                         git rebase --continue
  19                 else
  20                         echo "Moving forward with HEAD..."
  21                         git rebase --skip
  22                 fi
  23         fi
  24 else
  25         git rebase $TARGET_BRANCH
  26         if ( git status|grep "nothing to commit (working directory clean)" ); then
  27                 echo "Rebasing complete."
  28         else
  29                 echo "Please edit these unmerged files and run endbranch again:"
  30                 git status|grep unmerged|cut -d" " -f4-
  31         fi
  32 fi