Merge branch 'xf/user-manual-ff'

* xf/user-manual-ff: user-manual: fix the description of fast-forward

Junio C Hamano committed Oct 30, 2015 at 13:07 UTC 7fd4181c661260f10bf8cb3e80489c230205d774

No changes.