On Fri, May 02, 2014 at 03:14:44PM -0500, Felipe Contreras wrote: > brian m. carlson wrote: > > My point is that it's unclear to me what options I need to use to > > retain the current behavior (fast-forward if possible, merge > > otherwise) without a warning. > > The current behavior is to always merge (ff or otherwise), just what > `git merge` would do, so `git pull --merge`. I don't see what's > confusing about that.
When the documentation says "Forces a merge" without any clarifying statement, that implies to me that it always creates a new commit. I'm certain that I'm not the only person who is going to think that. Could you please clarify the documentation for --merge and pull.mode to avoid confusing users? -- 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
signature.asc
Description: Digital signature
