Merge branch 'km/rebase-doc-typofix'

Doc update. * km/rebase-doc-typofix: rebase docs: drop stray word in merge command description

Junio C Hamano committed Jan 14, 2019 at 15:29 UTC d95f610c64b9b33957beaa1da60a489d0b4aa7fc

No changes.