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 /sequencer.h | |
| 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 'sequencer.h')
| -rw-r--r-- | sequencer.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sequencer.h b/sequencer.h index d31c41f018..b2a501e445 100644 --- a/sequencer.h +++ b/sequencer.h @@ -45,9 +45,13 @@ struct replay_opts { int verbose; int quiet; int reschedule_failed_exec; + int committer_date_is_author_date; + int ignore_date; int mainline; + char *committer_name; + char *committer_email; char *gpg_sign; enum commit_msg_cleanup_mode default_msg_cleanup; int explicit_cleanup; |