Re: git rebase -i onto HEAD~n

From: Sitaram Chamarty <sitaramc@gmail.com>
Date: Feb 3, 2009, 17:18 UTC
Message-ID: <slrngogv3e.nak.sitaramc@sitaramc.homelinux.net>
In-Reply-To: <C5E2CAEE4A87D24DAB5334F62A72D1F43ADCA0@ELON17P32001A.csfb.cs-group.com>

On 2009-02-03, Bisani, Alok <alok.bisani@credit-suisse.com> wrote:

Show 8 quoted lines

>     # Leave editor for ~/gittest/.git/rebase-merge/git-rebase-todo with
>     squash 8df4c33 two
>     # deleted line with discard
>     squash 91f8267 three
>
>     # And get this error
>     grep: /home/user/gittest/.git/rebase-merge/done: No such file or directory
>     Cannot 'squash' without a previous commit

Quoting from "git help rebase"'s interactive mode section:

    If you want to fold two or more commits into one,
    replace the command "pick" with "squash" for the second
    and subsequent commit.

Keep the first one as "pick", don't make both of them squash.

-- 
Sitaram

We've long needed a filesystem named after a vegetable --
Andrew Morton