summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-12-01 17:04:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-12-01 17:04:29 (GMT)
commitfac9ab1419152593900a65aed65d05fd2bd2273d (patch)
tree55932afa381db08de61251238f255a2882cc9b78
parenta2b0451434db903975cb1dfda0eafef939ebc6db (diff)
parent8dd327b2465c5d2af62b85cb7974ceec41ab25f2 (diff)
downloadgit-fac9ab1419152593900a65aed65d05fd2bd2273d.zip
git-fac9ab1419152593900a65aed65d05fd2bd2273d.tar.gz
git-fac9ab1419152593900a65aed65d05fd2bd2273d.tar.bz2
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.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt
index 4b45d83..7586c5a 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