So I'm confused here, and maybe you can enlighten me. As I read this
documentation, --merge would always force a merge, like --no-ff. If so,
I don't see an option to preserve the existing behavior, which is the
I-don't-care-just-do-it case. If the behavior is different, then this
documentation needs to be improved, I think, along with the
documentation earlier in the series.
--
brian m. carlson / brian with sandals: Houston, Texas, US
+1 832 623 2791 | http://www.crustytoothpaste.net/~bmc | My opinion only
OpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187