summaryrefslogtreecommitdiff
path: root/commit.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-09-03 19:37:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-09-03 19:37:01 (GMT)
commit9c31b19dd00981fcea435de1cd05eab179039a8d (patch)
tree970ac78108fa329c76070f30ed1b3280add80c87 /commit.h
parente19713638985533ce461db072b49112da5bd2042 (diff)
parent6160b2e9a486f5dc29f621e94a0e5dcce0ab3d52 (diff)
downloadgit-9c31b19dd00981fcea435de1cd05eab179039a8d.zip
git-9c31b19dd00981fcea435de1cd05eab179039a8d.tar.gz
git-9c31b19dd00981fcea435de1cd05eab179039a8d.tar.bz2
Merge branch 'pw/rebase-i-more-options'
"git rebase -i" learns a bit more options. * pw/rebase-i-more-options: t3436: do not run git-merge-recursive in dashed form rebase: add --reset-author-date rebase -i: support --ignore-date rebase -i: support --committer-date-is-author-date am: stop exporting GIT_COMMITTER_DATE rebase -i: add --ignore-whitespace flag
Diffstat (limited to 'commit.h')
-rw-r--r--commit.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/commit.h b/commit.h
index e901538..bd73b84 100644
--- a/commit.h
+++ b/commit.h
@@ -270,10 +270,9 @@ int commit_tree(const char *msg, size_t msg_len,
int commit_tree_extended(const char *msg, size_t msg_len,
const struct object_id *tree,
- struct commit_list *parents,
- struct object_id *ret, const char *author,
- const char *sign_commit,
- struct commit_extra_header *);
+ struct commit_list *parents, struct object_id *ret,
+ const char *author, const char *committer,
+ const char *sign_commit, struct commit_extra_header *);
struct commit_extra_header *read_commit_extra_headers(struct commit *, const char **);