Sergey Organov <sorganov@xxxxxxxxx> writes: > So I believe this change is inline with the rest of the patch. The > reference to git-pull (if it remains) should be a side-note, not part of > explanation of operation. Not really. The thing is, "This is the most common" needs to be close to "Often...". "git merge" directly invoked by the end user is much less likely to encounter a fast forward situation; getting invoked indirectly by "git pull" makes it common.