Merge branch 'ra/rebase-i-more-options'
authorJunio C Hamano <gitster@pobox.com>
Tue, 10 Dec 2019 21:11:41 +0000 (13:11 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 Dec 2019 21:11:41 +0000 (13:11 -0800)
commit5d9324e0f4210bb7d52bcb79efe3935703083f72
tree182d0ae2188c6dc315178c990c7c125126e85d5f
parentc58ae96fc4bb11916b62a96940bb70bb85ea5992
parentd82dfa7f5b88d57cd4ddaf2c27a7218a39b9dd53
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
Documentation/git-rebase.txt
builtin/rebase.c
sequencer.c
sequencer.h
t/t3422-rebase-incompatible-options.sh