Merge branch 'ks/commit-do-not-touch-cut-line'

The explanation of the cut-line in the commit log editor has been
slightly tweaked.

* ks/commit-do-not-touch-cut-line:
  commit-template: change a message to be more intuitive
This commit is contained in:
Junio C Hamano 2017-09-25 15:24:07 +09:00
Родитель d019010559 8c4b1a3593
Коммит 77f45395b0
1 изменённых файлов: 1 добавлений и 1 удалений

Просмотреть файл

@ -934,7 +934,7 @@ size_t wt_status_locate_end(const char *s, size_t len)
void wt_status_add_cut_line(FILE *fp)
{
const char *explanation = _("Do not touch the line above.\nEverything below will be removed.");
const char *explanation = _("Do not modify or remove the line above.\nEverything below it will be ignored.");
struct strbuf buf = STRBUF_INIT;
fprintf(fp, "%c %s", comment_line_char, cut_line);