From: Junio C Hamano <redacted>
Date: Fri, 30 Oct 2015 20:07:05 +0000 (-0700)
Subject: Merge branch 'xf/user-manual-ff'
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=7fd4181c661260f10bf8cb3e80489c230205d774;p=git.git

Merge branch 'xf/user-manual-ff'

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

7fd4181c661260f10bf8cb3e80489c230205d774