Re: merging multiple commit into one?

From: Heiko Voigt <hvoigt@hvoigt.net>
Date: May 11, 2009, 21:29 UTC
Message-ID: <20090511212923.GA19844@macbook.lan>
In-Reply-To: <1de9d39c0905110621p6858bca8y8bb036a167754672@mail.gmail.com>

On Mon, May 11, 2009 at 03:21:27PM +0200, jean-luc malet wrote:

> according to my knowledge of git, removing the commit and rewriting
> the last commit log so that it better reflect the modification will do
> the job but I'm not sure git allow it...

If you just want to get rid of the last commit

  git reset HEAD^

will remove the commit but keep your working directory untouched. In such a workflow I find it easier to start the new commit from zero than from the stashed stuff.

By the way. You might also take a look at the command

  git stash

which is especially crafted for saving work in progress.

cheers Heiko