summaryrefslogtreecommitdiff
path: root/oidset.h
diff options
context:
space:
mode:
authorLibravatar Phillip Wood <phillip.wood@dunelm.org.uk>2020-08-17 18:40:03 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-08-19 15:19:59 -0700
commita3894aad67df655a9c7f3b511093f681d3a01fb7 (patch)
tree52dc920b2f4465db647f8b1f3b86c62b324f1a83 /oidset.h
parentrebase -i: support --committer-date-is-author-date (diff)
downloadtgif-a3894aad67df655a9c7f3b511093f681d3a01fb7.tar.xz
rebase -i: support --ignore-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 --ignore-date option to the merge backend. This option uses the current time as the author date rather than reusing the original author date when rewriting commits. We take care to handle the combination of --ignore-date and --committer-date-is-author-date in the same way as the apply backend. 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 'oidset.h')
0 files changed, 0 insertions, 0 deletions