Hi,
On Mon, 28 Apr 2008, Junio C Hamano wrote:
> Johannes Schindelin <Johannes.Schindelin@xxxxxx> writes:
>
> > On Mon, 28 Apr 2008, Junio C Hamano wrote:
> >
> >> Johannes Schindelin <Johannes.Schindelin@xxxxxx> 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.
>
> That means moving the lines around inside the todo insn list makes the
> same "reset cdefghij" mean different things.
>
> That's insanity.
I beg you pardon?
Consider this history:
A - B - C - D
\
E - F
Now, depending if B was rewritten or not, would you not want the reset
before E to mean _different_ things?
I.e. _if_ B is rewritten, E should branch off of the _rewritten_ B, but if
B is _not_ rewritten, E should branch off of the original B?
Ciao,
Dscho
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
