Re: how to combine 2 commits?

From: Matthieu Moy <matthieu.moy@imag.fr>
Date: Jan 13, 2009, 06:48 UTC
Message-ID: <vpqiqojpuqn.fsf@bauges.imag.fr>
In-Reply-To: <slrngmodgv.ple.sitaramc@sitaramc.homelinux.net>

Sitaram Chamarty <sitaramc@gmail.com> writes:

Show 5 quoted lines

> I like using "git rebase -i HEAD~5" (if I want to rebase the
> last 5 commits).  In the editor that pops up, I reorder the
> ones that I know should be together, and on each set to be
> squashed, I change the "pick" to "s" (for squash) on all but
> the first one.  Save the file and it's all done.

And right after, you probably want to do stg like

  git diff master@{1} master

to see whether you actually changed the result by reordering your patches.

-- 
Matthieu