mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
git-rebase.txt: correct out-of-date and misleading text about renames
Commit58634dbff8
("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 commit579c9bb198
("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>
This commit is contained in:
parent
b36ade216c
commit
6320813bc0
|
@ -340,9 +340,7 @@ See also INCOMPATIBLE OPTIONS below.
|
|||
|
||||
-m::
|
||||
--merge::
|
||||
Use merging strategies to rebase. When the recursive (default) merge
|
||||
strategy is used, this allows rebase to be aware of renames on the
|
||||
upstream side. This is the default.
|
||||
Using merging strategies to rebase (default).
|
||||
+
|
||||
Note that a rebase merge works by replaying each commit from the working
|
||||
branch on top of the <upstream> branch. Because of this, when a merge
|
||||
|
|
Loading…
Reference in a new issue