Re: [PATCH] user-manual: fix the description of fast-forward

2015-10-26 Thread Junio C Hamano
Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[PATCH] user-manual: fix the description of fast-forward

2015-10-24 Thread Xue Fuqiao
Currently, the "Fast-forward merges" section of user-manual.txt 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. Correct this issue and improve wording. Signed-off-by: Xue Fuqiao Thanks-to: Junio C Hamano --- Di