contrib / subtree / READMEon commit merge-options.txt: clarify meaning of various ff-related options (27fd1e4)
   1
   2Please read git-subtree.txt for documentation.
   3
   4Please don't contact me using github mail; it's slow, ugly, and worst of
   5all, redundant. Email me instead at apenwarr@gmail.com and I'll be happy to
   6help.
   7
   8Avery