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

Merge branch 'ts/checkout-advice-plural'

Browse Source 
* ts/checkout-advice-plural:
  checkout: call a single commit "it" intead of "them"
This commit is contained in:
Junio C Hamano
2015-05-05 21:00:27 -07:00
parent 7502b230ce fc792ca860
commit e971a1f9d5
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
builtin/checkout.c
View File

@ -743,10 +743,17 @@ static void suggest_reattach(struct commit *commit, struct rev_info *revs)
if (advice_detached_head) if (advice_detached_head)
fprintf(stderr, fprintf(stderr,
_( Q_(
/* The singular version */
"If you want to keep it by creating a new branch, "
"this may be a good time\nto do so with:\n\n"
" git branch <new-branch-name> %s\n\n",
/* The plural version */
"If you want to keep them by creating a new branch, " "If you want to keep them by creating a new branch, "
"this may be a good time\nto do so with:\n\n" "this may be a good time\nto do so with:\n\n"
" git branch <new-branch-name> %s\n\n"), " git branch <new-branch-name> %s\n\n",
/* Give ngettext() the count */
lost),
find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV)); find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV));
} }