merge: handle --ff/--no-ff/--ff-only as a tri-state option
[git] / RelNotes
1 Documentation/RelNotes/1.8.4.txt