On Tue, Jun 03, 2008 at 07:40:21AM -0700, Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> 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.
Attachment:
pgpu7pilU5a24.pgp
Description: PGP signature
