diff options
| author | Elijah Newren <newren@gmail.com> | 2021-08-04 23:50:52 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-08-05 08:57:40 -0700 |
| commit | 6320813bc0daf03f087072a498b5aaa8bbba36bd (patch) | |
| tree | 5f6352c33e8ca8e26d177ee88731ba33d07bcb56 /Documentation/git-rebase.txt | |
| parent | b36ade216c4a72dda6b8e3006cd3ded44ece1c66 (diff) | |
| download | git-6320813bc0daf03f087072a498b5aaa8bbba36bd.tar.gz | |
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>
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index cecdcfff47..73d49ec8d9 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -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 |