Re: how to squash two commits into only one

From: Alex Riesen <raa.lkml@gmail.com>
Date: Mar 29, 2011, 10:58 UTC
Message-ID: <AANLkTikX5YvMrooVi-7e-YDrCP_7QHqL6wR=1bY1cZ2L@mail.gmail.com>
In-Reply-To: <AANLkTimsN40twLwOWXsQqbv0SVN7T9rEHSUpcVum8aFR@mail.gmail.com>

On Tue, Mar 29, 2011 at 12:10, Lynn Lin <lynn.xin.lin@gmail.com> wrote:

Show 13 quoted lines

> On Tue, Mar 29, 2011 at 5:38 PM, Alex Riesen <raa.lkml@gmail.com> wrote:
>> On Tue, Mar 29, 2011 at 07:42, Lynn Lin <lynn.xin.lin@gmail.com> wrote:
>>> All,
>>>   I have only have two commits in repo,then I want to squash these
>>> two commit into one through git rebase -i .However it fails
>>>
>>> $ git rebase -i HEAD^1
>>> it only show up one commit so can't squash (can't squash without a
>>> previous commit)
>>
>> $ git rebase -i HEAD~2
>>
> only have two commits

Uh. That's unusual.

Than yes, "git reset HEAD^; git commit --amend" seems the best solution.