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.html | |
| parent | 8ac8a3d8dd001611b77776fa19ef37c2c87cd987 (diff) | |
| download | git-htmldocs-8ef91f31f6606a0370b18943c3b0f089e04873f9.tar.gz | |
Autogenerated HTML docs for v2.24.0-308-g228f5
Diffstat (limited to 'git-bisect.html')
| -rw-r--r-- | git-bisect.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-bisect.html b/git-bisect.html index bfb9d859d..90c6cf304 100644 --- a/git-bisect.html +++ b/git-bisect.html @@ -1127,7 +1127,7 @@ Automatically bisect with temporary modifications (hot-fix): # 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
@@ -1229,7 +1229,7 @@ help</code> or <code>git bisect -h</code> to get a long usage description.</p></ <div id="footer">
<div id="footer-text">
Last updated
- 2018-04-25 17:24:48 JST
+ 2019-12-01 14:55:34 PST
</div>
</div>
</body>
|