Merge branch 'ah/rebase-no-fork-point-config'
commit682bbad64d9afd438d9b293c18331c1018672fee
authorJunio C Hamano <gitster@pobox.com>
Fri, 26 Feb 2021 00:43:31 +0000 (25 16:43 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 26 Feb 2021 00:43:31 +0000 (25 16:43 -0800)
tree688ed7a3c73bfee2f8b5e9b68466c8a2e5331991
parent628c13cceed408526df39dbbd4a0d00bc4f34803
parent2803d800d2268cde4b932fab38dffe6712d86d16
Merge branch 'ah/rebase-no-fork-point-config'

"git rebase --[no-]fork-point" gained a configuration variable
rebase.forkPoint so that users do not have to keep specifying a
non-default setting.

* ah/rebase-no-fork-point-config:
  rebase: add a config option for --no-fork-point
t/t3431-rebase-fork-point.sh