tree 688ed7a3c73bfee2f8b5e9b68466c8a2e5331991
parent 628c13cceed408526df39dbbd4a0d00bc4f34803
parent 2803d800d2268cde4b932fab38dffe6712d86d16
author Junio C Hamano <gitster@pobox.com> 1614300211 -0800
committer Junio C Hamano <gitster@pobox.com> 1614300211 -0800

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