summaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-03-15 00:09:20 -0700
committerJunio C Hamano <gitster@pobox.com>2008-03-15 00:09:33 -0700
commit267123b4299ea2c2f090ef169f9fc5039897cd72 (patch)
treeecbbe5be7cfd059b001af3195d71a0b9cece8c30 /commit.h
parent2a2ad0c0007b9f79768b4564644ac9eaaa7310b6 (diff)
parent6bf4f1b4c9d78b2061bd5f3bf77bb21112b755be (diff)
downloadgit-267123b4299ea2c2f090ef169f9fc5039897cd72.tar.gz
Merge branch 'maint'
* maint: format-patch: generate MIME header as needed even when there is format.header
Diffstat (limited to 'commit.h')
-rw-r--r--commit.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/commit.h b/commit.h
index a1e9591426..2f63bc8b2f 100644
--- a/commit.h
+++ b/commit.h
@@ -70,7 +70,7 @@ extern void pretty_print_commit(enum cmit_fmt fmt, const struct commit*,
struct strbuf *,
int abbrev, const char *subject,
const char *after_subject, enum date_mode,
- int non_ascii_present);
+ int need_8bit_cte);
void pp_user_info(const char *what, enum cmit_fmt fmt, struct strbuf *sb,
const char *line, enum date_mode dmode,
const char *encoding);
@@ -80,7 +80,7 @@ void pp_title_line(enum cmit_fmt fmt,
const char *subject,
const char *after_subject,
const char *encoding,
- int plain_non_ascii);
+ int need_8bit_cte);
void pp_remainder(enum cmit_fmt fmt,
const char **msg_p,
struct strbuf *sb,