diff options
| author | Elijah Newren <newren@gmail.com> | 2021-08-05 01:50:52 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-08-05 17:57:40 +0200 |
| commit | 6320813bc0daf03f087072a498b5aaa8bbba36bd (patch) | |
| tree | 5f6352c33e8ca8e26d177ee88731ba33d07bcb56 /Documentation/merge-strategies.txt | |
| parent | merge-strategies.txt: fix simple capitalization error (diff) | |
| download | git-6320813bc0daf03f087072a498b5aaa8bbba36bd.tar.xz git-6320813bc0daf03f087072a498b5aaa8bbba36bd.zip | |
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/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions