diff options
Diffstat (limited to 'helpers/git-pull')
| -rwxr-xr-x | helpers/git-pull | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/helpers/git-pull b/helpers/git-pull index 3dbd3e1..6db6029 100755 --- a/helpers/git-pull +++ b/helpers/git-pull @@ -4,7 +4,7 @@ # not to keep the prefix. If the branch already exists, try to merge. If not, # check out from origin. # -# Syntax: git-pull linaro-local/[branch] -f +# Syntax: git-pull linaro-local/[branch] . llvm-common @@ -12,10 +12,6 @@ branch=$1 if [[ $branch = '' ]]; then branch=`get_branch` fi -force=$2 -if [[ $force != '-f' ]]; then - force= -fi if [[ $branch = 'master' ]]; then echo "Can't pull the master branch." @@ -37,17 +33,9 @@ fi # If the branch exists already, merge if git branch | grep -q $branch; then - if [[ $force = '-f' ]]; then - echo " + Force check out $branch" - safe_run git checkout master - safe_run git branch -D $branch - safe_run git checkout -b $branch origin/$prefix$branch - exit 0 - fi - echo " + Merging the origin branch..." if not git merge --ff-only origin/$prefix$branch; then - echo "Error merging the branch. Use -f to force." + echo "Error merging the branch." exit 1 fi # If not, just check out the branch |