git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Lynn Lin <lynn.xin.lin@gmail.com>
To: Alex Riesen <raa.lkml@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: how to squash two commits into only one
Date: Tue, 29 Mar 2011 18:10:05 +0800	[thread overview]
Message-ID: <AANLkTimsN40twLwOWXsQqbv0SVN7T9rEHSUpcVum8aFR@mail.gmail.com> (raw)
In-Reply-To: <AANLkTi=7TNjLVrcJVppiULBnDdKCM_vqwhn1JqoW+DQo@mail.gmail.com>

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

  reply	other threads:[~2011-03-29 10:10 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-29  5:42 how to squash two commits into only one Lynn Lin
     [not found] ` <AANLkTi=PZY2d+NhNnnOyXMX70N31vRg3qS5er+hECy8A@mail.gmail.com>
2011-03-29  6:04   ` Lynn Lin
2011-03-29  6:15 ` Tor Arntsen
2011-03-29  8:24   ` Lynn Lin
2011-03-29  8:50     ` Tor Arntsen
2011-03-29  9:38 ` Alex Riesen
2011-03-29 10:10   ` Lynn Lin [this message]
2011-03-29 10:58     ` Alex Riesen
2011-03-29 12:44       ` Joshua Juran
2011-03-29 12:49         ` Nguyen Thai Ngoc Duy
2011-03-29 13:12           ` Joshua Juran
2011-03-29 15:02             ` Will Palmer
2011-03-29 18:28           ` Junio C Hamano
2011-03-30 19:22             ` Dirk Süsserott

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=AANLkTimsN40twLwOWXsQqbv0SVN7T9rEHSUpcVum8aFR@mail.gmail.com \
    --to=lynn.xin.lin@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=raa.lkml@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).