diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-11-15 10:25:05 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-15 10:25:05 -0800 |
| commit | 4ad4fce63a67cde3a93e6678724ed79b06109ad6 (patch) | |
| tree | 6993697c9b9a6ee8916d620a1e177fea8a636b32 /notes.h | |
| parent | 159a5a2fa2b5da57a5b69dafc816d30c3716604f (diff) | |
| parent | 1d34c50f132d2234bd70956ef99b2b94786d43dd (diff) | |
| download | git-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 'notes.h')
| -rw-r--r-- | notes.h | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -237,10 +237,6 @@ void prune_notes(struct notes_tree *t, int flags); */ void free_notes(struct notes_tree *t); -/* Flags controlling how notes are formatted */ -#define NOTES_SHOW_HEADER 1 -#define NOTES_INDENT 2 - struct string_list; struct display_notes_opt { @@ -274,7 +270,7 @@ void init_display_notes(struct display_notes_opt *opt); * You *must* call init_display_notes() before using this function. */ void format_display_notes(const unsigned char *object_sha1, - struct strbuf *sb, const char *output_encoding, int flags); + struct strbuf *sb, const char *output_encoding, int raw); /* * Load the notes tree from each ref listed in 'refs'. The output is |