diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-12-01 14:58:27 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-01 14:58:27 -0800 |
| commit | 8ef91f31f6606a0370b18943c3b0f089e04873f9 (patch) | |
| tree | 2bf27a3779a34fa4bf69dfc02e1fe1be848ea0d2 /git-bisect.txt | |
| parent | 8ac8a3d8dd001611b77776fa19ef37c2c87cd987 (diff) | |
| download | git-htmldocs-8ef91f31f6606a0370b18943c3b0f089e04873f9.tar.gz | |
Autogenerated HTML docs for v2.24.0-308-g228f5
Diffstat (limited to 'git-bisect.txt')
| -rw-r--r-- | git-bisect.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-bisect.txt b/git-bisect.txt index 4b45d837a..7586c5a84 100644 --- a/git-bisect.txt +++ b/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 |