For large changes that I especially expect to break portability issues I make 
a set of changes, merge into next to check on all machines and then fix the 
issues that come up in tests the next day. This can happen a few times. 

  Now if I only did testing on my own machine during these several days, since 
my branch never touches another branch I can rebase it, I can reset some 
changes if I realize they are really stupid, then I could put a very nice 
commit into master with a great history.

   How can I do this after I have put all the trash into next along the way? Is 
there a modification of the next model we can use that would allow me to have 
clearer histories? How do other groups handle this, we know Linus doesn’t allow 
ugly histories so how can the model work for them?

   Barry

Reply via email to