aboutsummaryrefslogtreecommitdiffstats
path: root/builtin.h
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2008-09-25 09:16:33 -0700
committerShawn O. Pearce <spearce@spearce.org>2008-09-25 09:16:33 -0700
commit1fa24f8f3d950b17ac15979c09b733c8e6f5c00c (patch)
treecd2c8c5995a42a407daabd1012d9b46faf180a9b /builtin.h
parentMerge branch 'jc/apply-include-exclude' (diff)
parentt7603: add new testcases to ensure builtin-commit uses reduce_heads() (diff)
downloadgit-1fa24f8f3d950b17ac15979c09b733c8e6f5c00c.tar.gz
git-1fa24f8f3d950b17ac15979c09b733c8e6f5c00c.zip
Merge branch 'mv/commit-tree'
* mv/commit-tree: t7603: add new testcases to ensure builtin-commit uses reduce_heads() builtin-commit: use commit_tree() commit_tree(): add a new author parameter
Diffstat (limited to 'builtin.h')
-rw-r--r--builtin.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin.h b/builtin.h
index e67cb2090e..8893b3ca59 100644
--- a/builtin.h
+++ b/builtin.h
@@ -17,7 +17,8 @@ extern int read_line_with_nul(char *buf, int size, FILE *file);
extern int fmt_merge_msg(int merge_summary, struct strbuf *in,
struct strbuf *out);
extern int commit_tree(const char *msg, unsigned char *tree,
- struct commit_list *parents, unsigned char *ret);
+ struct commit_list *parents, unsigned char *ret,
+ const char *author);
extern int check_pager_config(const char *cmd);
extern int cmd_add(int argc, const char **argv, const char *prefix);