Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
push/pull: adjust missing upstream help text to changed interface
author
Michael J Gruber
<git@drmicha.warpmail.net>
Tue, 6 Nov 2012 10:29:01 +0000
(11:29 +0100)
committer
Jeff King
<peff@peff.net>
Thu, 8 Nov 2012 16:32:38 +0000
(11:32 -0500)
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>
git-parse-remote.sh
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
7e20105
)
diff --git
a/git-parse-remote.sh
b/git-parse-remote.sh
index 484b2e61ccd6df166a8d6447556ccca4236840ad..0e87e0915ee16e36385aa4182b3a4271d1308641 100644
(file)
--- 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:
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
"
fi
exit 1