Andrew's git / gitweb.git / diff
?
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)
* xf/user-manual-ff:
user-manual: fix the description of fast-forward

1  2 
Documentation/user-manual.txt patch | diff1 | diff2 | blob | history
diff --cc Documentation/user-manual.txt
Simple merge