Skip to content

Commit

Permalink
branch: replace deprecated --set-upstream with --set-upstream-to
Browse files Browse the repository at this point in the history
  • Loading branch information
jamiew committed Dec 10, 2012
1 parent 6a5d9ab commit 955f971
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion branch
Expand Up @@ -36,7 +36,7 @@ if [ -n "$local_branch_exists" ] && [ ! "$local_branch_exists" == '' ]; then
# echo "Remote branch exists. Local branch is tracking: $tracking"
if [[ ! "$tracking" =~ "$remote" ]]; then
echo "Your local branch is not tracking the corresponding remote branch, fixing..."
git branch --set-upstream $branch $remote/$branch
git branch --set-upstream-to $branch $remote/$branch
fi
# else
# echo "Remote branch does not exist, not doing anything"
Expand Down

0 comments on commit 955f971

Please sign in to comment.