From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Mon, 28 Apr 2008 18:01:32 GMT
Subject: Re: [PATCH 2/2] Fix t3404 assumption that `wc -l` does not use whitespace.
Message-ID: <alpine.DEB.1.00.0804281851520.19187@eeepc-johanness>
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