diff options
Diffstat (limited to 'third_party/git/Documentation/git-bisect.txt')
| -rw-r--r-- | third_party/git/Documentation/git-bisect.txt | 2 |
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 4b45d837a7..7586c5a843 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 hot-fix && +if git merge --no-commit --no-ff hot-fix && make then # run project specific test and report its status |