On Thu, Jun 19, 2008 at 12:26 PM, Gavin Romig-Koch <[EMAIL PROTECTED]> wrote: >> The problem that I have is of interleaved changes. I work for a >> little on patch A, then patch B, then patch A again, but A and B >> should be kept separate so that they can be easily reviewed. A and B >> may or may have dependencies on one another. >> > Separate branches for A and B, and use "git rebase" to move these branches > to later checkout's from Ian's tree. See > http://www.kernel.org/pub/software/scm/git/docs/user-manual.html#using-git-rebase
But be sure to read section "problems with rewriting history". In a nutshell: it invalidates cloned repos i.e. git rebase is fine if you're the only one working on that branch but it makes collaboration (i.e. others cloning the branch and making additional improvements) impossible. -- kjk _______________________________________________ fonc mailing list [email protected] http://vpri.org/mailman/listinfo/fonc
