summaryrefslogtreecommitdiff
path: root/commit.h
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 /commit.h
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 'commit.h')
-rw-r--r--commit.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/commit.h b/commit.h
index c4cd046160..b6ad8f3f30 100644
--- a/commit.h
+++ b/commit.h
@@ -86,7 +86,7 @@ struct pretty_print_context {
enum date_mode date_mode;
unsigned date_mode_explicit:1;
int need_8bit_cte;
- int show_notes;
+ char *notes_message;
struct reflog_walk_info *reflog_info;
const char *output_encoding;
};
@@ -99,8 +99,6 @@ extern int has_non_ascii(const char *text);
struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
extern char *logmsg_reencode(const struct commit *commit,
const char *output_encoding);
-extern char *reencode_commit_message(const struct commit *commit,
- const char **encoding_p);
extern void get_commit_format(const char *arg, struct rev_info *);
extern const char *format_subject(struct strbuf *sb, const char *msg,
const char *line_separator);