Skip to content

Commit

Permalink
Merge branch 'mg/maint-pull-suggest-upstream-to'
Browse files Browse the repository at this point in the history
Follow-on to the new "--set-upstream-to" topic from v1.8.0 to avoid
suggesting the deprecated "--set-upstream".

* mg/maint-pull-suggest-upstream-to:
  push/pull: adjust missing upstream help text to changed interface
  • Loading branch information
Junio C Hamano committed Nov 15, 2012
2 parents 6050b5b + a3a4391 commit 159a5a2
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion git-parse-remote.sh
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ See git-${cmd}(1) for details
If you wish to set tracking information for this branch you can do so with:
git branch --set-upstream ${branch_name#refs/heads/} $remote/<branch>
git branch --set-upstream-to=$remote/<branch> ${branch_name#refs/heads/}
"
fi
exit 1
Expand Down

0 comments on commit 159a5a2

Please sign in to comment.