From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 24 Jul 2018 21:50:43 +0000 (-0700)
Subject: Merge branch 'en/rebase-consistency'
X-Git-Tag: v2.19.0-rc0~141
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ce5a698c6f775c2cc18de9eb62d558b1b85d752;p=thirdparty%2Fgit.git

Merge branch 'en/rebase-consistency'

"git rebase" behaved slightly differently depending on which one of
the three backends gets used; this has been documented and an
effort to make them more uniform has begun.

* en/rebase-consistency:
  git-rebase: make --allow-empty-message the default
  t3401: add directory rename testcases for rebase and am
  git-rebase.txt: document behavioral differences between modes
  directory-rename-detection.txt: technical docs on abilities and limitations
  git-rebase.txt: address confusion between --no-ff vs --force-rebase
  git-rebase: error out when incompatible options passed
  t3422: new testcases for checking when incompatible options passed
  git-rebase.sh: update help messages a bit
  git-rebase.txt: document incompatible options
---

0ce5a698c6f775c2cc18de9eb62d558b1b85d752