Merge branch 'en/directory-renames-nothanks-doc-update'
authorJunio C Hamano <gitster@pobox.com>
Mon, 14 Jan 2019 23:29:32 +0000 (15:29 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 14 Jan 2019 23:29:32 +0000 (15:29 -0800)
Doc update.

* en/directory-renames-nothanks-doc-update:
  git-rebase.txt: update note about directory rename detection and am

1  2 
Documentation/git-rebase.txt

Simple merge