RelNoteson commit merge: handle --ff/--no-ff/--ff-only as a tri-state option (a54841e)
   1Documentation/RelNotes/1.8.4.txt