aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-11-20 10:15:09 -0800
committerJunio C Hamano <gitster@pobox.com>2012-11-20 10:15:09 -0800
commit91d0cd9a6e7ec15af5b1b3796a040400d992b46b (patch)
treea74a4844c79357f2ae4c2354549323ce780b9e17
parentcf48960b6dd5c0d8b8767fa0088bd166e619de57 (diff)
parenta3a4391abfeb664d8239b232bbee32b2163c10bd (diff)
downloadgit-91d0cd9a6e7ec15af5b1b3796a040400d992b46b.tar.gz
git-91d0cd9a6e7ec15af5b1b3796a040400d992b46b.tar.xz
Merge branch 'mg/maint-pull-suggest-upstream-to' into maint
* mg/maint-pull-suggest-upstream-to: push/pull: adjust missing upstream help text to changed interface
-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