summaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-24 19:19:47 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-05-24 19:19:47 (GMT)
commit73f0a1577b92f9ce932b34a6b8657dcb377dc311 (patch)
treea131f036395394ff2b32c855f510080c818c33e6 /commit.h
parentf2054be4c4816d8c363dc867f462bc0af9031c02 (diff)
parentefbff23609654ac0542d3421d19eea8dbc1f80cd (diff)
downloadgit-73f0a1577b92f9ce932b34a6b8657dcb377dc311.zip
git-73f0a1577b92f9ce932b34a6b8657dcb377dc311.tar.gz
git-73f0a1577b92f9ce932b34a6b8657dcb377dc311.tar.bz2
Merge branch 'js/fmt-patch'
This makes "git format-patch" a built-in. * js/fmt-patch: git-rebase: use canonical A..B syntax to format-patch git-format-patch: now built-in. fmt-patch: Support --attach fmt-patch: understand old <his> notation Teach fmt-patch about --keep-subject Teach fmt-patch about --numbered fmt-patch: implement -o <dir> fmt-patch: output file names to stdout Teach fmt-patch to write individual files. Use RFC2822 dates from "git fmt-patch". git-fmt-patch: thinkofix to show [PATCH] properly. rename internal format-patch wip Minor tweak on subject line in --pretty=email Tentative built-in format-patch.
Diffstat (limited to 'commit.h')
-rw-r--r--commit.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/commit.h b/commit.h
index de142af..c9de167 100644
--- a/commit.h
+++ b/commit.h
@@ -45,12 +45,13 @@ enum cmit_fmt {
CMIT_FMT_FULL,
CMIT_FMT_FULLER,
CMIT_FMT_ONELINE,
+ CMIT_FMT_EMAIL,
CMIT_FMT_UNSPECIFIED,
};
extern enum cmit_fmt get_commit_format(const char *arg);
-extern unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *, unsigned long len, char *buf, unsigned long space, int abbrev);
+extern unsigned long pretty_print_commit(enum cmit_fmt fmt, const struct commit *, unsigned long len, char *buf, unsigned long space, int abbrev, const char *subject, const char *after_subject);
/** Removes the first commit from a list sorted by date, and adds all
* of its parents.