summaryrefslogtreecommitdiff
path: root/environment.c
diff options
context:
space:
mode:
authorLibravatar Phillip Wood <phillip.wood@dunelm.org.uk>2020-08-17 18:40:02 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-08-17 11:58:37 -0700
commit7573cec52c0274ceb166c425be4288f6b3103d6f (patch)
tree6c44e2d1c7c53f313cc6e5745c33e23e808f081e /environment.c
parentam: stop exporting GIT_COMMITTER_DATE (diff)
downloadtgif-7573cec52c0274ceb166c425be4288f6b3103d6f.tar.xz
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 'environment.c')
0 files changed, 0 insertions, 0 deletions