Andrew's git / gitweb.git / diff
?
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)
Doc update.

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

Trivial merge