From: Stephen Kelly <steveire@gmail.com>
To: git@vger.kernel.org
Subject: Re: git interactive rebase 'consume' command
Date: Sun, 20 Jan 2013 20:13:12 +0100 [thread overview]
Message-ID: <kdhfk6$von$1@ger.gmane.org> (raw)
In-Reply-To: 7vk3r7llod.fsf@alter.siamese.dyndns.org
Junio C Hamano wrote:
> Sorry, but I do not understand what you are trying to solve.
>
> How can 1313a5e, which fixes misakes made in c2f62a3, come before
> that commit in the first place?
One scenario is something like this:
Start with a clean HEAD (always a good idea :) )
hack hack hack
make multiple commits
realize that a hunk you committed in an early patch belongs in a later one.
use git rebase -i to fix it.
Is that more clear?
Thanks,
Steve.
next prev parent reply other threads:[~2013-01-20 19:19 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-20 14:05 git interactive rebase 'consume' command Stephen Kelly
2013-01-20 14:17 ` John Keeping
2013-01-20 14:23 ` Stephen Kelly
2013-01-20 19:05 ` Junio C Hamano
2013-01-20 19:13 ` Stephen Kelly [this message]
2013-01-20 20:23 ` Junio C Hamano
2013-01-21 1:49 ` Jeff King
2013-01-21 8:40 ` Stephen Kelly
2013-01-21 11:05 ` Michael Haggerty
2013-01-21 19:05 ` Stephen Kelly
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='kdhfk6$von$1@ger.gmane.org' \
--to=steveire@gmail.com \
--cc=git@vger.kernel.org \
/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).