diff options
| author |  Mihail Atanassov <m.atanassov92@gmail.com> | 2019-10-28 22:01:22 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-10-29 11:53:56 +0900 |
| commit | 8dd327b2465c5d2af62b85cb7974ceec41ab25f2 (patch) | |
| tree | 08b84613f6d635c1c3f4822c878f96e1f3b4c5c7 /Documentation | |
| parent | Git 2.23 (diff) | |
| download | tgif-8dd327b2465c5d2af62b85cb7974ceec41ab25f2.tar.xz | |
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>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-bisect.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt index 4b45d837a7..7586c5a843 100644 --- 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 |