I've been working on a feature branch called 3x20 for a while, staying up to date with master by merging master into 3x20 whenever i felt like it. I had pushed the feature branch to git.linuxcnc.org, so i had to merge, i couldn't rebase. The commits to the feature branch were very much a stream of consciousness thing - poorly thought out, poorly ordered, not even compiling half the time.
But i didn't pollute master's history with that junk. I redeemed myself by using "git rebase -i" and "git gui" a couple of times to split some commits into several logical commits, then reordering and squashing several commits into one. The end result is a short, linear sequence of commits, on top of today's master, where each commit is logically stand-alone and consistent. It looks all pwetty. :-) Next i'll remove the feature branch from git.linuxcnc.org so i don't have to look at my past sins. So yeah, i like git. I'm glad we switched. Yay, Board! -- Sebastian Kuzminsky ------------------------------------------------------------------------------ Return on Information: Google Enterprise Search pays you back Get the facts. http://p.sf.net/sfu/google-dev2dev _______________________________________________ Emc-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/emc-developers
