From: Junio C Hamano Date: Fri, 30 Oct 2015 20:07:05 +0000 (-0700) Subject: Merge branch 'xf/user-manual-ff' X-Git-Tag: v2.7.0-rc0~53 X-Git-Url: https://git.uis.cam.ac.uk/x/uis/git/git.git/commitdiff_plain/7fd4181c661260f10bf8cb3e80489c230205d774 Merge branch 'xf/user-manual-ff' * xf/user-manual-ff: user-manual: fix the description of fast-forward --- 7fd4181c661260f10bf8cb3e80489c230205d774