]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'ma/bisect-doc-sample-update'
authorJunio C Hamano <gitster@pobox.com>
Sun, 1 Dec 2019 17:04:29 +0000 (09:04 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 1 Dec 2019 17:04:29 +0000 (09:04 -0800)
commitfac9ab1419152593900a65aed65d05fd2bd2273d
tree55932afa381db08de61251238f255a2882cc9b78
parenta2b0451434db903975cb1dfda0eafef939ebc6db
parent8dd327b2465c5d2af62b85cb7974ceec41ab25f2
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