Documentation/git-bisect.txt: add --no-ff to merge command

[thirdparty/git.git] / Documentation / git-bisect.txt

diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt
index 4b45d837a7e7c590fe3aa5f575009c43342b833c..7586c5a8437edfc146fa3b802bc5e72e5070ee9a 100644 (file)
--- a/Documentation/git-bisect.txt
+++ b/Documentation/git-bisect.txt
@@ -413,7 +413,7 @@ $ cat ~/test.sh
 
 # tweak the working tree by merging the hot-fix branch
 # and then attempt a build
-if     git merge --no-commit hot-fix &&
+if     git merge --no-commit --no-ff hot-fix &&
        make
 then
        # run project specific test and report its status