Re: Trouble testing out a patch on a branch new scratch git.git repository

From: Brent Goodrick <bgoodr@gmail.com>
Date: Feb 9, 2009, 02:59 UTC
Message-ID: <e38bce640902081859o47462a58s59c120209fabb0@mail.gmail.com>
In-Reply-To: <200902081918.35665.bss@iguanasuicide.net>

On Sun, Feb 8, 2009 at 5:18 PM, Boyd Stephen Smith Jr. <bss@iguanasuicide.net> wrote:

Show 7 quoted lines

> > 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