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 /t/t3422-rebase-incompatible-options.sh | |
| 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 't/t3422-rebase-incompatible-options.sh')
| -rwxr-xr-x | t/t3422-rebase-incompatible-options.sh | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/t/t3422-rebase-incompatible-options.sh b/t/t3422-rebase-incompatible-options.sh index 50e7960702..c8234062c6 100755 --- a/t/t3422-rebase-incompatible-options.sh +++ b/t/t3422-rebase-incompatible-options.sh @@ -61,8 +61,6 @@ test_rebase_am_only () { } test_rebase_am_only --whitespace=fix -test_rebase_am_only --ignore-whitespace -test_rebase_am_only --committer-date-is-author-date test_rebase_am_only -C4 test_expect_success REBASE_P '--preserve-merges incompatible with --signoff' ' |