Craig de Stigter <craig.destigter <at> koordinates.com> writes: > Hi list Hi. > I have two branches which start with the same commits, and I want to merge > them. > I believe the two branches were individually pulled from the same SVN > repo, so they look like this: > > branch1: a--b--c--d--e--f--1--3--5 > branch2: a--b--c--d--e--f--2--4--6 [...] > Is there a way to do this without the duplicates? (perhaps a way to > mark the branch as merged up to 'f', without actually performing a > merge?) Yes, you can use grafts (cf gitrepository-layout(5)) to rewrite the parent pointer for eg commit 2 from f(2) to f(1). > Thanks > Craig de Stigter -- Henrik Grubbström <grubba@xxxxxxxxxx> Roxen Internet Software AB <grubba@xxxxxxxxx> -- 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