Hi, Jonathan Nieder <jrnieder@xxxxxxxxx> writes: [snip] > +Assume the following history exists and the current branch is > +"`master`": > + > +------------ > + A---B---C topic > + / > + D---E---F---G master > +------------ > + > +Then "`git merge topic`" will replay the changes made on the > +`topic` branch since it diverged from `master` (i.e., `E`) until > +its current commit (`C`) on top of `master`, and record the result > +in a new commit along with the names of the two parent commits and > +a log message from the user describing the changes. The word 'replay' seems inappropriate for a description of 'merge'. To me 'replay' seems a synonym of 'rebase' (and IIRC tla has a 'replay' command that was similar to 'rebase' [1]). (Yeah, I know, I'm responding 3 weeks too late, and the patch is already in the tree.) - Hari [1] http://www.gnu.org/software/gnu-arch/tutorial/Introducing-replay-_002d_002d-An-Alternative-to-update.html -- 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