Skip to content

Commit

Permalink
co -> checkout
Browse files Browse the repository at this point in the history
  • Loading branch information
kintel committed Jan 20, 2011
1 parent de8a137 commit 307005f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions run-from-git.sh
Expand Up @@ -12,9 +12,9 @@ fi
cd `dirname $0` cd `dirname $0`


git fetch upstream # Get all remote changes git fetch upstream # Get all remote changes
git co $branch # Switch to local branch if it exists git checkout $branch # Switch to local branch if it exists
if [ $? -ne 0 ]; then # ..else get branch from upstream if [ $? -ne 0 ]; then # ..else get branch from upstream
git co -b $branch upstream/$branch git checkout -b $branch upstream/$branch
fi fi
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
git merge upstream/$branch # Only merge if nothing went wrong git merge upstream/$branch # Only merge if nothing went wrong
Expand Down

0 comments on commit 307005f

Please sign in to comment.