diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-12-11 00:11:41 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-12-11 00:11:41 +0300 |
commit | 5d9324e0f4210bb7d52bcb79efe3935703083f72 (patch) | |
tree | 182d0ae2188c6dc315178c990c7c125126e85d5f /sequencer.h | |
parent | c58ae96fc4bb11916b62a96940bb70bb85ea5992 (diff) | |
parent | d82dfa7f5b88d57cd4ddaf2c27a7218a39b9dd53 (diff) |
Merge branch 'ra/rebase-i-more-options'
"git rebase -i" learned a few options that are known by "git
rebase" proper.
* ra/rebase-i-more-options:
rebase -i: finishing touches to --reset-author-date
rebase: add --reset-author-date
rebase -i: support --ignore-date
sequencer: rename amend_author to author_to_rename
rebase -i: support --committer-date-is-author-date
sequencer: allow callers of read_author_script() to ignore fields
rebase -i: add --ignore-whitespace flag
Diffstat (limited to 'sequencer.h')
-rw-r--r-- | sequencer.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sequencer.h b/sequencer.h index 9f9ae291e3..e9a0e03ea2 100644 --- a/sequencer.h +++ b/sequencer.h @@ -43,6 +43,8 @@ struct replay_opts { int verbose; int quiet; int reschedule_failed_exec; + int committer_date_is_author_date; + int ignore_date; int mainline; |