Merge branch 'en/merge-options-doc'
authorJunio C Hamano <gitster@pobox.com>
Thu, 7 Mar 2019 00:59:58 +0000 (09:59 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 7 Mar 2019 00:59:58 +0000 (09:59 +0900)
commit082c15ade1833e80a65c36d2499676a924d6d6aa
tree2b648a2506aab4873a188668968ef005fc9589d3
parentb0e7fb2e5cc70a03d75e41fe6b1bde6fdc0872c8
parent1ede45e44b3b3bef8598ca077a60a6483ede99ae
Merge branch 'en/merge-options-doc'

Doc update.

* en/merge-options-doc:
  merge-options.txt: correct wording of --no-commit option