From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 30 Oct 2015 20:07:05 +0000 (-0700)
Subject: Merge branch 'xf/user-manual-ff'
X-Git-Tag: v2.7.0-rc0~53
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7fd4181c661260f10bf8cb3e80489c230205d774?ds=inline;hp=--cc

Merge branch 'xf/user-manual-ff'

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

7fd4181c661260f10bf8cb3e80489c230205d774