]> git.ipfire.org Git - thirdparty/git.git/commit - Documentation/user-manual.txt
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 282616c) | patch
user-manual: fix the description of fast-forward
authorXue Fuqiao <xfq.free@gmail.com>
Sun, 25 Oct 2015 00:28:43 +0000 (08:28 +0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 26 Oct 2015 20:03:44 +0000 (13:03 -0700)
commitb2af4829cc51fc90885948f19f24b76f2670a677
treedacae002ae40c7606062165a5d4f2887286f56ddtree | snapshot
parent282616c72d1d08a77ca4fe1186cb708c38408d87commit | diff
user-manual: fix the description of fast-forward

The "Fast-forward merges" section of user-manual.txt incorrectly
says if the current branch is a descendant of the other, Git will
perform a fast-forward merge, but it should the other way around.

Signed-off-by: Xue Fuqiao <xfq.free@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/user-manual.txt diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.