diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-09-03 22:37:01 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-03 22:37:01 +0300 |
| commit | 9c31b19dd00981fcea435de1cd05eab179039a8d (patch) | |
| tree | 970ac78108fa329c76070f30ed1b3280add80c87 /builtin/commit.c | |
| parent | e19713638985533ce461db072b49112da5bd2042 (diff) | |
| parent | 6160b2e9a486f5dc29f621e94a0e5dcce0ab3d52 (diff) | |
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 'builtin/commit.c')
| -rw-r--r-- | builtin/commit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 671721c385..5d91b13a5c 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1672,8 +1672,8 @@ int cmd_commit(int argc, const char **argv, const char *prefix) } if (commit_tree_extended(sb.buf, sb.len, &active_cache_tree->oid, - parents, &oid, author_ident.buf, sign_commit, - extra)) { + parents, &oid, author_ident.buf, NULL, + sign_commit, extra)) { rollback_index_files(); die(_("failed to write commit object")); } |