Hi, On Thu, 18 Jun 2009, Matthieu Moy wrote: > Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes: > > > I'd really rather stay with "fixup". > > I like fixup. I'd say "fixup: <message>" so that the thing actually > looks like a program directive rather than natural language. Umm... The thing would be used like this: original edit list: pick b1ab1ab First commit pick deafbee Second commit pick 0123456 This is a fixup for the first commit edited edit list: pick b1ab1ab First commit fixup 0123456 This is a fixup for the first commit pick deafbee Second commit It would squash the first two commits, forget about the second commit message and continue with the last commit. No user interaction unless there are merge conflicts. Ciao, Dscho -- 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