mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
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>
This commit is contained in:
parent
5fa0f5238b
commit
8dd327b246
|
@ -413,7 +413,7 @@ $ cat ~/test.sh
|
||||||
|
|
||||||
# tweak the working tree by merging the hot-fix branch
|
# tweak the working tree by merging the hot-fix branch
|
||||||
# and then attempt a build
|
# and then attempt a build
|
||||||
if git merge --no-commit hot-fix &&
|
if git merge --no-commit --no-ff hot-fix &&
|
||||||
make
|
make
|
||||||
then
|
then
|
||||||
# run project specific test and report its status
|
# run project specific test and report its status
|
||||||
|
|
Loading…
Reference in a new issue