On 4/11/07, Alexander Litvinov <litvinov2004@xxxxxxxxx> wrote:
What is --merge for ? Will the result be the same ?
Maybe, maybe not. It uses merge strategies instead of git-am and has advantages over blindly applying the patches (it can know how a change got in, and it uses resolved conflict cache). - 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