Merge branch 'jc/advice-about-to-lose-commit'
* jc/advice-about-to-lose-commit: checkout: make advice when reattaching the HEAD less loud Conflicts: builtin/checkout.c
This commit is contained in:
commit
0faf247485
@ -657,24 +657,25 @@ static void suggest_reattach(struct commit *commit, struct rev_info *revs)
|
||||
"Warning: you are leaving %d commit behind, "
|
||||
"not connected to\n"
|
||||
"any of your branches:\n\n"
|
||||
"%s\n"
|
||||
"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",
|
||||
"%s\n",
|
||||
/* The plural version */
|
||||
"Warning: you are leaving %d commits behind, "
|
||||
"not connected to\n"
|
||||
"any of your branches:\n\n"
|
||||
"%s\n"
|
||||
"If you want to keep them 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",
|
||||
"%s\n",
|
||||
/* Give ngettext() the count */
|
||||
lost),
|
||||
lost,
|
||||
sb.buf,
|
||||
sha1_to_hex(commit->object.sha1));
|
||||
sb.buf);
|
||||
strbuf_release(&sb);
|
||||
|
||||
if (advice_detached_head)
|
||||
fprintf(stderr,
|
||||
_(
|
||||
"If you want to keep them 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"),
|
||||
sha1_to_hex(commit->object.sha1));
|
||||
}
|
||||
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user