diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-11-15 10:24:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-15 10:24:59 -0800 |
| commit | 159a5a2fa2b5da57a5b69dafc816d30c3716604f (patch) | |
| tree | ef4fd585e9d73bbb9b77b949de2ad48730812b48 | |
| parent | Merge branch 'mh/notes-string-list' (diff) | |
| parent | push/pull: adjust missing upstream help text to changed interface (diff) | |
| download | tgif-159a5a2fa2b5da57a5b69dafc816d30c3716604f.tar.xz | |
Merge branch 'mg/maint-pull-suggest-upstream-to'
Follow-on to the new "--set-upstream-to" topic from v1.8.0 to avoid
suggesting the deprecated "--set-upstream".
* mg/maint-pull-suggest-upstream-to:
push/pull: adjust missing upstream help text to changed interface
| -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 484b2e61cc..0e87e0915e 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 |