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)
commit9a01f165d44a310f5f46019d822d95adf65f6277
tree5abb939d62c3bfa63a0fa036d633251f9aa37b41
parentd076ad1330ea79fb1364d2078446f8936627f96c
parenta8f5a59067073a8e5d4949e288a1bc8757109065
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
Documentation/git-rebase.txt