From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 1 May 2020 20:39:58 +0000 (-0700)
Subject: Merge branch 'en/rebase-root-and-fork-point-are-incompatible'
X-Git-Tag: v2.27.0-rc0~51
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6d6b412da32229bf6a5f366a72b5ad29cc70ce59;p=thirdparty%2Fgit.git

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
---

6d6b412da32229bf6a5f366a72b5ad29cc70ce59