]> git.ipfire.org Git - thirdparty/git.git/commit
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)
commit684fea37948d720cc69b3553b42353b4b42709dc
treeb89542cdb28e65a958938c7f51f0df97e7d0b68c
parent6c66686e0b917df914af779257479c341590a9a0
parentb2af4829cc51fc90885948f19f24b76f2670a677
Merge branch 'xf/user-manual-ff' into maint

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