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

diff --combined Documentation/git-rebase.txt
index 2ee535fb23edc3aec9b8ceb5dace10279567f7ba,8285a388decbfceb342f9b996095f794d1ba90d1..d284155cf33dfb9460d4af487eef680585959017
--- 1/Documentation/git-rebase.txt
--- 2/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@@ -570,8 -570,9 +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[]
  
@@@ -979,7 -980,7 +980,7 @@@ when the merge operation did not even s
  
  At this time, the `merge` command will *always* use the `recursive`
  merge strategy for regular merges, and `octopus` for octopus merges,
 -strategy, with no way to choose a different one. To work around
 +with no way to choose a different one. To work around
  this, an `exec` command can be used to call `git merge` explicitly,
  using the fact that the labels are worktree-local refs (the ref
  `refs/rewritten/onto` would correspond to the label `onto`, for example).