From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 4 Nov 2015 22:20:49 +0000 (-0800)
Subject: Merge branch 'xf/user-manual-ff' into maint
X-Git-Tag: v2.6.3~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=684fea37948d720cc69b3553b42353b4b42709dc;p=thirdparty%2Fgit.git

Merge branch 'xf/user-manual-ff' into maint

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

684fea37948d720cc69b3553b42353b4b42709dc