The journey with vendor branch in git
qhwt+dfly at les.ath.cx
Fri Dec 19 05:57:07 PST 2008
On Fri, Dec 19, 2008 at 10:13:08PM +0900, YONETANI Tomokazu wrote:
> > > > $ git merge --no-commit OPENPAM
> > > $ git merge --no-commit OPENPAM^ OPENPAM
> Well, I think both should give you the same result; the same changes
> and the same merge parents.
Actually this was wrong; with octopus, three records are recorded
as merge parents (HEAD... OPENPAM^... OPENPAM...), on the other hand
only two (HEAD... OPENPAM...) by the default merge method. I don't
know how it affects later merges, though.
More information about the Kernel