Heya, On Sat, Apr 10, 2010 at 01:27, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Sverre Rabbelier <srabbelier@xxxxxxxxx> writes: >> I run into this problem every now and then when I manually apply a >> patch. I apply it, do some stuff, and then having forgotten I already >> applied it, try to apply it again, and am confused as to why it won't >> apply. Would it be difficult to teach 'git am' to see if the patch-id >> of the patch that couldn't be applied has been applied already >> (similar to what 'git cherry' does I guess?) and print a helpful >> message saying "warning: patch already applied" when there is a >> conflict trying to apply such an already-applied patch? > > "am -3"? "Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... No changes -- Patch already applied." Yeah, that's pretty much what I want, only I'd like to get that as a warning when running 'git am' without the -3. Either that, or have -3 be the default, which we all know won't happen :P. If I'd realize that perhaps I'd already applied the patch I could indeed use 'git am -3' to check that, or, as I do now (after a few minutes of confusion), scroll up and notice that I'd already applied it. What I want is to save me those minutes of confusion by having git DWIW. -- Cheers, Sverre Rabbelier -- 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