summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-09-25 15:24:07 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-09-25 15:24:07 +0900
commit77f45395b01ad27534f751a74233c77912d80758 (patch)
tree5c72662b8a9d24a87267a7ec0d42ffd1c35651c0
parentMerge branch 'tg/refs-allowed-flags' (diff)
parentcommit-template: change a message to be more intuitive (diff)
downloadtgif-77f45395b01ad27534f751a74233c77912d80758.tar.xz
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
-rw-r--r--wt-status.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/wt-status.c b/wt-status.c
index ac972acbab..6f730ee8f2 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);