diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-09-03 21:37:01 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-03 21:37:01 +0200 |
| commit | 9c31b19dd00981fcea435de1cd05eab179039a8d (patch) | |
| tree | 970ac78108fa329c76070f30ed1b3280add80c87 /commit.h | |
| parent | Twelfth batch (diff) | |
| parent | t3436: do not run git-merge-recursive in dashed form (diff) | |
| download | git-9c31b19dd00981fcea435de1cd05eab179039a8d.tar.xz git-9c31b19dd00981fcea435de1cd05eab179039a8d.zip | |
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.h | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -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 **); |