diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-12-01 09:04:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-01 09:04:29 -0800 |
| commit | fac9ab1419152593900a65aed65d05fd2bd2273d (patch) | |
| tree | 55932afa381db08de61251238f255a2882cc9b78 | |
| parent | Merge branch 'js/git-path-head-dot-lock-fix' (diff) | |
| parent | Documentation/git-bisect.txt: add --no-ff to merge command (diff) | |
| download | git-fac9ab1419152593900a65aed65d05fd2bd2273d.tar.gz git-fac9ab1419152593900a65aed65d05fd2bd2273d.zip | |
Merge branch 'ma/bisect-doc-sample-update'
"git merge --no-commit" needs "--no-ff" if you do not want to move
HEAD, which has been corrected in the manual page for "git bisect".
* ma/bisect-doc-sample-update:
Documentation/git-bisect.txt: add --no-ff to merge command
| -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 |