From: Linus Torvalds Date: Tue, 23 Oct 2007 19:49:12 GMT Subject: Re: unmerging feature branches Message-ID: In-Reply-To: <7vir4x7hiu.fsf@gitster.siamese.dyndns.org> On Tue, 23 Oct 2007, Junio C Hamano wrote: > > Desire to revert an octopus would, as you demonstrated, often be > to revert only one arm, but I think allowing to revert a twohead > merge should be trivial. If we define "reverting a merge" to > always revert all arms, then this should suffice. The only reason I don't like this is that it kind of assumes that the mainline is the first parent. Maybe I'd like to revert a merge, but I want to revert a merge that somebody *else* did, and maybe it was the first-hand parent I don't like. Those kinds of issues don't exist with non-merge commits: there's never any question "which side" to revert. Linus