mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'po/doc-branch' into maint

Browse Source 
Doc update.

* po/doc-branch:
  doc branch: provide examples for listing remote tracking branches
This commit is contained in:
Junio C Hamano
2019-07-29 12:38:16 -07:00
parent 747201d0c8 1fde99cfc7
commit 0c47e8ddf5
2 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/branch.c
View File

@ -830,7 +830,8 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
strbuf_release(&buf);
} else if (argc > 0 && argc <= 2) {
if (filter.kind != FILTER_REFS_BRANCHES)
die(_("-a and -r options to 'git branch' do not make sense with a branch name"));
die(_("The -a, and -r, options to 'git branch' do not take a branch name.\n"
"Did you mean to use: -a|-r --list <pattern>?"));
if (track == BRANCH_TRACK_OVERRIDE)
die(_("the '--set-upstream' option is no longer supported. Please use '--track' or '--set-upstream-to' instead."));