Show 14 quoted lines
> Re substance, I am wondering if "In such a case" might be better, by
> the way. That is:
>
> A fast-forward is a special type of <<def_merge,merge>> where you have a
> <<def_revision,revision>> and you are "merging" another
> <<def_branch,branch>>'s changes that happen to be a descendant of what
> - you have. In such these cases, you do not make a new <<def_merge,merge>>
> + you have. In such a case, you do not make a new <<def_merge,merge>>
> <<def_commit,commit>> but instead just update to his
> revision. This will happen frequently on a
>
> It is not like there are multiple variants of "fast-forward"
> situations, in all of which the HEAD pointer is just moved without
> creating a new commit. There is only one variant of "fast-forward".