Documentation / RelNotes / 2.18.1.txton commit merge-options.txt: clarify meaning of various ff-related options (27fd1e4)
   1Git v2.18.1 Release Notes
   2=========================
   3
   4This release merges up the fixes that appear in v2.14.5 and in
   5v2.17.2 to address the recently reported CVE-2018-17456; see the
   6release notes for those versions for details.