Hi, 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. 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
