On Sun, Feb 8, 2009 at 5:18 PM, Boyd Stephen Smith Jr. <bss@xxxxxxxxxxxxxxxxx> wrote: > > What do you mean by "reorder, squash" mean here? Is that something > > that is done as a part of the -i option to git rebase? > > Reordering and squashing can be done via rebase -i, but it's basically just > the practice of "prettying" your changes. > http://magazine.redhat.com/2008/05/02/shipping-quality-code-with-git/ has more > prose on the subject. Thanks Boyd. I made the mistake of using git revert HEAD thinking it would just delete that last revision, but it instead added a new revision that acted as if it just reversed the changes. What I really want to do is simply replace the last two commits on the branch with one commit, so that when I make my patch it will be just the full set of changes and not a lot of noise. Is there a way to do that? (note: I did try the git merge --squash command but it just showed me the usage, as I was on my bg/no-progress branch). Note that I know that I would not be able to do this once some of my changes had merged upstream. Thanks, bgoodr -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
