about summary refs log tree commit diff
path: root/third_party/git/Documentation/git-bisect.txt
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/git/Documentation/git-bisect.txt')
-rw-r--r--third_party/git/Documentation/git-bisect.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/git/Documentation/git-bisect.txt b/third_party/git/Documentation/git-bisect.txt
index 7586c5a8437e..4b45d837a7e7 100644
--- a/third_party/git/Documentation/git-bisect.txt
+++ b/third_party/git/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 --no-ff hot-fix &&
+if	git merge --no-commit hot-fix &&
 	make
 then
 	# run project specific test and report its status