diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2020-08-17 17:40:02 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-08-17 18:58:37 (GMT) |
| commit | 7573cec52c0274ceb166c425be4288f6b3103d6f (patch) | |
| tree | 6c44e2d1c7c53f313cc6e5745c33e23e808f081e /t/t3422-rebase-incompatible-options.sh | |
| parent | e8cbe2118a8e3c1aa71ed8d93f96001decebde1d (diff) | |
| download | git-7573cec52c0274ceb166c425be4288f6b3103d6f.zip git-7573cec52c0274ceb166c425be4288f6b3103d6f.tar.gz git-7573cec52c0274ceb166c425be4288f6b3103d6f.tar.bz2 | |
rebase -i: support --committer-date-is-author-date
Rebase is implemented with two different backends - 'apply' and
'merge' each of which support a different set of options. In
particular the apply backend supports a number of options implemented
by 'git am' that are not implemented in the merge backend. This means
that the available options are different depending on which backend is
used which is confusing. This patch adds support for the
--committer-date-is-author-date option to the merge backend. This
option uses the author date of the commit that is being rewritten as
the committer date when the new commit is created.
Original-patch-by: Rohit Ashiwal <rohit.ashiwal265@gmail.com>
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3422-rebase-incompatible-options.sh')
| -rwxr-xr-x | t/t3422-rebase-incompatible-options.sh | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/t/t3422-rebase-incompatible-options.sh b/t/t3422-rebase-incompatible-options.sh index 55ca467..c823406 100755 --- a/t/t3422-rebase-incompatible-options.sh +++ b/t/t3422-rebase-incompatible-options.sh @@ -61,7 +61,6 @@ test_rebase_am_only () { } test_rebase_am_only --whitespace=fix -test_rebase_am_only --committer-date-is-author-date test_rebase_am_only -C4 test_expect_success REBASE_P '--preserve-merges incompatible with --signoff' ' |