Heya, On Wed, Sep 29, 2010 at 17:16, Johan Herland <johan@xxxxxxxxxxx> wrote: > Yeah, I'm torn as well. What about providing both? Or is that bloat? Definitely not both, that would be confusing, and would limit us if we decide to add 'git merge --abort' later on. >> I know that there's no 'git merge --abort', but IIRC that's for >> technical reasons only. > > Maybe there _should_ be a 'git merge --abort' (as a synonym to 'git > reset --merge')? Hmmm, I don't know if that does what the user wants, (I haven't used 'git reset --merge' before), but if it does, that sounds like a good solution. -- 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