diff options
| author | Michael J Gruber <git@drmicha.warpmail.net> | 2012-11-06 10:29:01 (GMT) |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2012-11-08 16:32:38 (GMT) |
| commit | a3a4391abfeb664d8239b232bbee32b2163c10bd (patch) | |
| tree | 830c8e5770a941189c82827219a07ed27c6ac788 | |
| parent | 7e2010537e96d0a1144520222f20ba1dc3d61441 (diff) | |
| download | git-a3a4391abfeb664d8239b232bbee32b2163c10bd.zip git-a3a4391abfeb664d8239b232bbee32b2163c10bd.tar.gz git-a3a4391abfeb664d8239b232bbee32b2163c10bd.tar.bz2 | |
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>
| -rw-r--r-- | git-parse-remote.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-parse-remote.sh b/git-parse-remote.sh index 484b2e6..0e87e09 100644 --- a/git-parse-remote.sh +++ b/git-parse-remote.sh @@ -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 |