From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 7 Mar 2019 00:59:58 +0000 (+0900)
Subject: Merge branch 'en/merge-options-doc'
X-Git-Tag: v2.22.0-rc0~163
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=082c15ade1833e80a65c36d2499676a924d6d6aa;p=thirdparty%2Fgit.git

Merge branch 'en/merge-options-doc'

Doc update.

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

082c15ade1833e80a65c36d2499676a924d6d6aa