On Fri, 24 Mar 2006 13:59:02 +0100, Andreas Ericsson wrote: > See how Junio does with next and pu and recommend your users to do the > same. There's no way of pulling a rebased branch, because the rebasing > destroys ancestry information, meaning the original commits other people > have cease to exist in your repository. But the "other people" still have those commits, so it should be rather straightforward for a tool to also perform a rebase for them when doing this kind of "rebased pull". I think there's just a single arc of data missing showing where a rebased commit object came from. So this sounds solvable, and it is something I would very much enjoy having, (call me funny, but I prefer to rebase and avoid a merge commit when looking at independent lines of development for which logically there shouldn't be any "merge" required). -Carl
Attachment:
pgpSBXzgri5in.pgp
Description: PGP signature