@matheusbsbs / matheus-bagliano / commits / 8dd327b246
Fork 0

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

The hotfix application example uses `git merge --no-commit` to apply temporary changes to the working tree during a bisect operation. In some situations this can be a fast-forward and `merge` will apply the hotfix branch's commits regardless of `--no-commit` (as documented in the `git merge` manual). In the pathological case this will make a `git bisect run` invocation loop indefinitely between the first bisect step and the fast-forwarded post-merge HEAD. Add `--no-ff` to the merge command to avoid this issue. Signed-off-by: Mihail Atanassov <m.atanassov92@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Mihail Atanassov committed Oct 28, 2019 at 22:01 UTC 8dd327b2465c5d2af62b85cb7974ceec41ab25f2
1 file changed +1 -1
Documentation/git-bisect.txt
+1 -1
@@ -413,7 +413,7 @@ $ cat ~/test.sh
413
414 # tweak the working tree by merging the hot-fix branch
415 # and then attempt a build
416 -if git merge --no-commit hot-fix &&
416 +if git merge --no-commit --no-ff hot-fix &&
417 make
418 then
419 # run project specific test and report its status