diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-25 06:24:07 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-25 06:24:07 (GMT) |
| commit | 77f45395b01ad27534f751a74233c77912d80758 (patch) | |
| tree | 5c72662b8a9d24a87267a7ec0d42ffd1c35651c0 /wt-status.c | |
| parent | d019010559b26784b0aea6cf08b43f576ef027f9 (diff) | |
| parent | 8c4b1a3593fca2a5315aa5a266fb11d5bdb78330 (diff) | |
| download | git-77f45395b01ad27534f751a74233c77912d80758.zip git-77f45395b01ad27534f751a74233c77912d80758.tar.gz git-77f45395b01ad27534f751a74233c77912d80758.tar.bz2 | |
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
Diffstat (limited to 'wt-status.c')
| -rw-r--r-- | wt-status.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wt-status.c b/wt-status.c index ac972ac..6f730ee 100644 --- a/wt-status.c +++ b/wt-status.c @@ -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); |