summaryrefslogtreecommitdiff
path: root/revision.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-11-15 10:25:05 -0800
committerJunio C Hamano <gitster@pobox.com>2012-11-15 10:25:05 -0800
commit4ad4fce63a67cde3a93e6678724ed79b06109ad6 (patch)
tree6993697c9b9a6ee8916d620a1e177fea8a636b32 /revision.c
parent159a5a2fa2b5da57a5b69dafc816d30c3716604f (diff)
parent1d34c50f132d2234bd70956ef99b2b94786d43dd (diff)
downloadgit-4ad4fce63a67cde3a93e6678724ed79b06109ad6.tar.gz
Merge branch 'jc/prettier-pretty-note'
Emit the notes attached to the commit in "format-patch --notes" output after three-dashes. * jc/prettier-pretty-note: format-patch: add a blank line between notes and diffstat Doc User-Manual: Patch cover letter, three dashes, and --notes Doc format-patch: clarify --notes use case Doc notes: Include the format-patch --notes option Doc SubmittingPatches: Mention --notes option after "cover letter" Documentation: decribe format-patch --notes format-patch --notes: show notes after three-dashes format-patch: append --signature after notes pretty_print_commit(): do not append notes message pretty: prepare notes message at a centralized place format_note(): simplify API pretty: remove reencode_commit_message()
Diffstat (limited to 'revision.c')
-rw-r--r--revision.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/revision.c b/revision.c
index d7d621cdbf..95d21e6472 100644
--- a/revision.c
+++ b/revision.c
@@ -2242,7 +2242,7 @@ static int commit_match(struct commit *commit, struct rev_info *opt)
if (!buf.len)
strbuf_addstr(&buf, commit->buffer);
format_display_notes(commit->object.sha1, &buf,
- get_log_output_encoding(), 0);
+ get_log_output_encoding(), 1);
}
/* Find either in the commit object, or in the temporary */