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 /commit-graph.c | |
parent | a2b0451434db903975cb1dfda0eafef939ebc6db (diff) | |
parent | 8dd327b2465c5d2af62b85cb7974ceec41ab25f2 (diff) |
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
Diffstat (limited to 'commit-graph.c')
0 files changed, 0 insertions, 0 deletions