From: Heiko Voigt <hvoigt@hvoigt.net>
To: jean-luc malet <jeanluc.malet@gmail.com>
Cc: git <git@vger.kernel.org>
Subject: Re: merging multiple commit into one?
Date: Mon, 11 May 2009 23:29:24 +0200 [thread overview]
Message-ID: <20090511212923.GA19844@macbook.lan> (raw)
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
next prev parent reply other threads:[~2009-05-11 21:29 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-11 13:21 merging multiple commit into one? jean-luc malet
2009-05-11 13:31 ` Andreas Ericsson
2009-05-11 13:50 ` Jakub Narebski
2009-05-11 22:11 ` MALET Jean-Luc
2009-05-11 22:36 ` Jakub Narebski
2009-05-12 15:59 ` jean-luc malet
2009-05-11 21:29 ` Heiko Voigt [this message]
2009-05-11 22:11 ` MALET Jean-Luc
2009-05-12 15:53 ` Heiko Voigt
2009-05-12 20:37 ` Markus Heidelberg
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=20090511212923.GA19844@macbook.lan \
--to=hvoigt@hvoigt.net \
--cc=git@vger.kernel.org \
--cc=jeanluc.malet@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).