Browse Source

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

Doc update.

* en/directory-renames-nothanks-doc-update:
  git-rebase.txt: update note about directory rename detection and am
maint
Junio C Hamano 6 years ago
parent
commit
9a01f165d4
  1. 5
      Documentation/git-rebase.txt

5
Documentation/git-rebase.txt

@ -570,8 +570,9 @@ it to keep commits that started empty.
Directory rename detection Directory rename detection
~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~


The merge and interactive backends work fine with Directory rename heuristics are enabled in the merge and interactive
directory rename detection. The am backend sometimes does not. backends. Due to the lack of accurate tree information, directory
rename detection is disabled in the am backend.


include::merge-strategies.txt[] include::merge-strategies.txt[]



Loading…
Cancel
Save