Merge branch 'en/fast-import-merge-doc'
authorJunio C Hamano <gitster@pobox.com>
Thu, 22 Aug 2019 19:34:12 +0000 (12:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 22 Aug 2019 19:34:12 +0000 (12:34 -0700)
commit22e86e85cba1e2697aea46810238ef9b3c7401cf
tree9a2a806b4ed5e4e373c854e26df51497fc6b410e
parent9c7573581c0804a5225b486d03f45cc3200b69b1
parentd1387d389549fe6e1b97ad88a0f7dbf3afe96c16
Merge branch 'en/fast-import-merge-doc'

Doc update.

* en/fast-import-merge-doc:
  git-fast-import.txt: clarify that multiple merge commits are allowed
Documentation/git-fast-import.txt