Heya, On Wed, Jul 28, 2010 at 21:19, Shawn O. Pearce <spearce@xxxxxxxxxxx> wrote: > Yes. Its called an octopus merge. It happpens sometimes when > merging 2 or more otherwise fairly isolated changes in a single > shot. E.g. `git merge feature-a feature-b thing-c`. Do we have an explanation anywhere as to when one would use a octopus merge? -- 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