]> git.ipfire.org Git - thirdparty/git.git/commit
git-rebase.txt: correct out-of-date and misleading text about renames
authorElijah Newren <newren@gmail.com>
Wed, 4 Aug 2021 23:50:52 +0000 (23:50 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Aug 2021 15:57:40 +0000 (08:57 -0700)
commit6320813bc0daf03f087072a498b5aaa8bbba36bd
tree5f6352c33e8ca8e26d177ee88731ba33d07bcb56
parentb36ade216c4a72dda6b8e3006cd3ded44ece1c66
git-rebase.txt: correct out-of-date and misleading text about renames

Commit 58634dbff8 ("rebase: Allow merge strategies to be used when
rebasing", 2006-06-21) added the --merge option to git-rebase so that
renames could be detected (at least when using the `recursive` merge
backend).  However, git-am -3 gained that same ability in commit
579c9bb198 ("Use merge-recursive in git-am -3.", 2006-12-28).  As such,
the comment about being able to detect renames is not particularly
noteworthy.  Remove it.

Acked-by: Derrick Stolee <dstolee@microsoft.com>
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-rebase.txt