From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 30 Sep 2019 04:19:28 +0000 (+0900)
Subject: Merge branch 'en/merge-options-ff-and-friends'
X-Git-Tag: v2.24.0-rc0~108
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9bc67b6658a031b92cba4a7489b78a4da902ecbf;p=thirdparty%2Fgit.git

Merge branch 'en/merge-options-ff-and-friends'

Doc update.

* en/merge-options-ff-and-friends:
  merge-options.txt: clarify meaning of various ff-related options
---

9bc67b6658a031b92cba4a7489b78a4da902ecbf