tree b7536738d6dec7ff9cd60a9a891cc5e3e9f7e12e
parent aabf3ea14439bccc87bdfd3d23315a19f928fab4
parent a35413c3785bf71e2c018691d6cd5f93638ba9ae
author Junio C Hamano <gitster@pobox.com> 1588365598 -0700
committer Junio C Hamano <gitster@pobox.com> 1588365598 -0700

Merge branch 'en/rebase-root-and-fork-point-are-incompatible'

Incompatible options "--root" and "--fork-point" of "git rebase"
have been marked and documented as being incompatible.

* en/rebase-root-and-fork-point-are-incompatible:
  rebase: display an error if --root and --fork-point are both provided