Skip to content

Commit

Permalink
push/pull: adjust missing upstream help text to changed interface
Browse files Browse the repository at this point in the history
In case of a missing upstream, the git-parse-remote script suggests:

If you wish to set tracking information for this branch you can do so
with:

    git branch --set-upstream nsiv2 origin/<branch>

But --set-upstream is deprectated. Change the suggestion to:

    git branch --set-upstream-to=origin/<branch> nsiv2

Reported-by: Jeroen van der Ham <vdham@uva.nl>
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Signed-off-by: Jeff King <peff@peff.net>
  • Loading branch information
Michael J Gruber authored and Jeff King committed Nov 8, 2012
1 parent 7e20105 commit a3a4391
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 a3a4391

Please sign in to comment.