aboutsummaryrefslogtreecommitdiff
path: root/git-parse-remote.sh
diff options
context:
space:
mode:
authorMichael J Gruber <git@drmicha.warpmail.net>2012-11-06 11:29:01 +0100
committerJeff King <peff@peff.net>2012-11-08 11:32:38 -0500
commita3a4391abfeb664d8239b232bbee32b2163c10bd (patch)
tree830c8e5770a941189c82827219a07ed27c6ac788 /git-parse-remote.sh
parent7e2010537e96d0a1144520222f20ba1dc3d61441 (diff)
downloadgit-a3a4391abfeb664d8239b232bbee32b2163c10bd.tar.gz
git-a3a4391abfeb664d8239b232bbee32b2163c10bd.tar.xz
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>
Diffstat (limited to 'git-parse-remote.sh')
-rw-r--r--git-parse-remote.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-parse-remote.sh b/git-parse-remote.sh
index 484b2e61c..0e87e0915 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