Merge branch 'xf/user-manual-ff'
authorJunio C Hamano <gitster@pobox.com>
Fri, 30 Oct 2015 20:07:05 +0000 (13:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 30 Oct 2015 20:07:05 +0000 (13:07 -0700)
commit7fd4181c661260f10bf8cb3e80489c230205d774
tree9a90aa5e998b4c572a7340a2c949c9be3bb6a03a
parent0692a6c22c37e07ef07a3d2c5d39deaaa3c26ffe
parentb2af4829cc51fc90885948f19f24b76f2670a677
Merge branch 'xf/user-manual-ff'

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