]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a2b0451 8dd327b)
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)
"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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.