diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-02-04 10:23:49 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-04 10:23:49 -0800 |
| commit | 149a4211a4b8d8bbcdd72685d538d6ac7365e29e (patch) | |
| tree | f0e37272889876737f0216021ea8d23785763fa2 /builtin/commit.c | |
| parent | bcd45b4085f9269a536c8fb1963ac8380bfac0e8 (diff) | |
| parent | eff80a9fd990de3605063050dae32f969ef18ba8 (diff) | |
| download | git-149a4211a4b8d8bbcdd72685d538d6ac7365e29e.tar.gz | |
Merge branch 'jc/custom-comment-char'
Allow a configuration variable core.commentchar to customize the
character used to comment out the hint lines in the edited text from
the default '#'.
* jc/custom-comment-char:
Allow custom "comment char"
Diffstat (limited to 'builtin/commit.c')
| -rw-r--r-- | builtin/commit.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 38b9a9cc0d..6c95fa76d8 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -733,15 +733,15 @@ static int prepare_to_commit(const char *index_file, const char *prefix, if (cleanup_mode == CLEANUP_ALL) status_printf(s, GIT_COLOR_NORMAL, _("Please enter the commit message for your changes." - " Lines starting\nwith '#' will be ignored, and an empty" - " message aborts the commit.\n")); + " Lines starting\nwith '%c' will be ignored, and an empty" + " message aborts the commit.\n"), comment_line_char); else /* CLEANUP_SPACE, that is. */ status_printf(s, GIT_COLOR_NORMAL, _("Please enter the commit message for your changes." - " Lines starting\n" - "with '#' will be kept; you may remove them" - " yourself if you want to.\n" - "An empty message aborts the commit.\n")); + " Lines starting\n" + "with '%c' will be kept; you may remove them" + " yourself if you want to.\n" + "An empty message aborts the commit.\n"), comment_line_char); if (only_include_assumed) status_printf_ln(s, GIT_COLOR_NORMAL, "%s", only_include_assumed); |