Documentation/git-bisect.txt: add --no-ff to merge command
authorMihail Atanassov <redacted>
Mon, 28 Oct 2019 22:01:22 +0000 (22:01 +0000)
committerJunio C Hamano <redacted>
Tue, 29 Oct 2019 02:53:56 +0000 (11:53 +0900)
commit8dd327b2465c5d2af62b85cb7974ceec41ab25f2
tree08b84613f6d635c1c3f4822c878f96e1f3b4c5c7
parent5fa0f5238b0cd46cfe7f6fa76c3f526ea98148d9
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 <redacted>
Reviewed-by: Jonathan Nieder <redacted>
Signed-off-by: Junio C Hamano <redacted>
Documentation/git-bisect.txt
git clone https://git.99rst.org/PROJECT