development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 03:29:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'en/directory-renames-nothanks-doc-update'

Browse source 
Doc update.

* en/directory-renames-nothanks-doc-update:
  git-rebase.txt: update note about directory rename detection and am
This commit is contained in:
Junio C Hamano 2019-01-14 15:29:32 -08:00
parent d076ad1330 a8f5a59067
commit 9a01f165d4
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Documentation/git-rebase.txt
View file

@ -570,8 +570,9 @@ it to keep commits that started empty.
Directory rename detection
~~~~~~~~~~~~~~~~~~~~~~~~~~
The merge and interactive backends work fine with
directory rename detection. The am backend sometimes does not.
Directory rename heuristics are enabled in the merge and interactive
backends. Due to the lack of accurate tree information, directory
rename detection is disabled in the am backend.
include::merge-strategies.txt[]