Re: Octopus merge: unique (?) to git, but is it useful?

On Tue, Jun 03, 2008 at 07:40:21AM -0700, Linus Torvalds [off-list ref] wrote:

Right. But git shouldn't do duplicate parents. I agree it's a mis-use of 
git merge, but either we should have errored out or we should have pruned 
the parents.

Yes, the end result is "tecnically correct", but it's not optimal.

I think the current git-merge.sh already handles this: 6ea23343
introduced the usage of git-show-branch --independent to filter out
duplicated parents.