From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 1 Dec 2019 17:04:29 +0000 (-0800)
Subject: Merge branch 'ma/bisect-doc-sample-update'
X-Git-Tag: v2.25.0-rc0~130
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fac9ab1419152593900a65aed65d05fd2bd2273d;p=thirdparty%2Fgit.git

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
---

fac9ab1419152593900a65aed65d05fd2bd2273d