scripts/pull

   1 #!/bin/sh
   2
   3 branch_name=$(git symbolic-ref --quiet HEAD)
   4 if [[ $? -ne 0 ]] ; then
   5         echo "Not on a branch"
   6         exit 1
   7 fi
   8 branch_name=${branch_name/refs\/heads\//}
   9
  10 git fetch
  11 if [[ $? -ne 0 ]] ; then
  12         exit $?
  13 fi
  14
  15 # rebase-p-i stops if nothing to do, even a ff, so do a non-i-p if needed
  16 if test "$(git rev-parse HEAD)" = "$(git merge-base HEAD origin/$branch_name)" ; then
  17         git rebase "origin/$branch_name"
  18 else
  19         GIT_EDITOR=: git rebase -p -i "origin/$branch_name"
  20 fi
  21