Browse Source

push/pull: adjust missing upstream help text to changed interface

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>
maint
Michael J Gruber 12 years ago committed by Jeff King
parent
commit
a3a4391abf
  1. 2
      git-parse-remote.sh

2
git-parse-remote.sh

@ -80,7 +80,7 @@ See git-${cmd}(1) for details @@ -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

Loading…
Cancel
Save