From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 9 Sep 2019 19:58:36 +0000 (-0700)
Subject: Merge branch 'en/merge-options-ff-and-friends' into next
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b3bcc2cbc7a1523eeb514421ed329fbac372edf3;p=git

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

Doc update.

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

b3bcc2cbc7a1523eeb514421ed329fbac372edf3