Merge branch 'jc/prettier-pretty-note'
authorJunio C Hamano <gitster@pobox.com>
Thu, 15 Nov 2012 18:25:05 +0000 (10:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 15 Nov 2012 18:25:05 +0000 (10:25 -0800)
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()

1  2 
commit.h
notes.c
pretty.c
revision.c
t/t4014-format-patch.sh
diff --cc commit.h
Simple merge
diff --cc notes.c
Simple merge
diff --cc pretty.c
Simple merge
diff --cc revision.c
Simple merge
Simple merge