From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Brian Gernhardt <benji@silverinsanity.com>, git@vger.kernel.org
Subject: Re: [PATCH 2/2] Fix t3404 assumption that `wc -l` does not use whitespace.
Date: Mon, 28 Apr 2008 19:01:32 +0100 (BST) [thread overview]
Message-ID: <alpine.DEB.1.00.0804281851520.19187@eeepc-johanness> (raw)
In-Reply-To: <7vd4oac5qf.fsf@gitster.siamese.dyndns.org>
Hi,
On Mon, 28 Apr 2008, Junio C Hamano wrote:
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>
> > Maybe an example would help:
> >
> > -- snip --
> > pick abcdefg This is the first commit to be picked
> > reset cdefghij
> > pick zyxwvux A commit in a side-branch
> > merge recursive abcdefg
> > -- snap --
>
> Indeed it does. "reset cdefghij" --- does it reset to the exact cdefghij
> commit, or cdefghij commit after rewriting?
In the example, it would be the original commit. However, a "reset
abcdefg" _after_ the "pick abcdefg" line would refer to the _rewritten_
commit.
The rationale: you are most likely not wanting to reference _both_ the
original _and_ the rewritten commit.
Ciao,
Dscho
next prev parent reply other threads:[~2008-04-28 18:02 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-27 15:16 [PATCH 2/2] Fix t3404 assumption that `wc -l` does not use whitespace Brian Gernhardt
2008-04-27 15:22 ` Johannes Schindelin
2008-04-27 15:32 ` Brian Gernhardt
2008-04-28 9:41 ` Jeff King
2008-04-28 9:56 ` Mike Ralphson
2008-05-13 9:11 ` Jeff King
2008-05-13 18:10 ` Mike Ralphson
2008-05-15 10:16 ` Mike Ralphson
2008-05-15 11:20 ` Jeff King
2008-05-15 11:23 ` Jeff King
2008-05-15 17:18 ` Junio C Hamano
2008-05-16 14:22 ` Mike Ralphson
2008-04-28 12:40 ` Brian Gernhardt
2008-04-27 17:31 ` Junio C Hamano
2008-04-28 10:13 ` Johannes Schindelin
2008-04-28 11:40 ` Jörg Sommer
2008-04-28 13:42 ` Johannes Schindelin
2008-04-28 16:30 ` Jörg Sommer
2008-04-28 18:07 ` Johannes Schindelin
2008-04-28 16:19 ` Junio C Hamano
2008-04-28 18:01 ` Johannes Schindelin [this message]
2008-04-28 21:24 ` Junio C Hamano
2008-04-28 21:30 ` Johannes Schindelin
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=alpine.DEB.1.00.0804281851520.19187@eeepc-johanness \
--to=johannes.schindelin@gmx.de \
--cc=benji@silverinsanity.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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