On 2009-02-03, Bisani, Alok <alok.bisani@xxxxxxxxxxxxxxxxx> wrote:
> # 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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
