Merge branch 'xf/user-manual-ff' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 4 Nov 2015 22:20:49 +0000 (14:20 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 4 Nov 2015 22:20:49 +0000 (14:20 -0800)
* xf/user-manual-ff:
user-manual: fix the description of fast-forward

1  2 
Documentation/user-manual.txt
Simple merge