]> git.ipfire.org Git - thirdparty/git.git/commit - builtin/rebase.c
rebase -i: support --committer-date-is-author-date
authorPhillip Wood <phillip.wood@dunelm.org.uk>
Mon, 17 Aug 2020 17:40:02 +0000 (18:40 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Aug 2020 18:58:37 +0000 (11:58 -0700)
commit7573cec52c0274ceb166c425be4288f6b3103d6f
tree6c44e2d1c7c53f313cc6e5745c33e23e808f081e
parente8cbe2118a8e3c1aa71ed8d93f96001decebde1d
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>
Documentation/git-rebase.txt
builtin/rebase.c
sequencer.c
sequencer.h
t/t3422-rebase-incompatible-options.sh
t/t3436-rebase-more-options.sh