> Is not the following option of the merge just for it? > > --no-commit > Perform the merge but pretend the merge failed and do not > autocommit, to give the user a chance to inspect and further tweak the > merge result before committing. yes and no... it doesn't auto-magically allow me to do what a merge conflict does. which is put together a diff. all it really did was not commit the auto merge. as far as --no-ff I'm not saying it commits the same way but I didn't see any difference in the resulting diffs, which, imho, all that matters is whether the resulting merged code is correct. -- Caleb Cushing -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
