git/Documentation/git-bisect.txt, branch v2.33.6

bisect: swap command-line options in documentation

2020-08-28T21:06:06Z

The positional arguments are specified in this order: "bad" then "good". To avoid confusion, the options above the positional arguments are now specified in the same order. They can still be specified in any order since they're options, not positional arguments. Signed-off-by: Hugo Locurcio Signed-off-by: Junio C Hamano

bisect: introduce first-parent flag

2020-08-07T22:13:03Z

Upon seeing a merge commit when bisecting, this option may be used to follow only the first parent. In detecting regressions introduced through the merging of a branch, the merge commit will be identified as introduction of the bug and its ancestors will be ignored. This option is particularly useful in avoiding false positives when a merged branch contained broken or non-buildable commits, but the merge itself was OK. Signed-off-by: Aaron Lipman Signed-off-by: Junio C Hamano

Documentation/git-bisect.txt: add --no-ff to merge command

2019-10-29T02:53:56Z

The hotfix application example uses `git merge --no-commit` to apply temporary changes to the working tree during a bisect operation. In some situations this can be a fast-forward and `merge` will apply the hotfix branch's commits regardless of `--no-commit` (as documented in the `git merge` manual). In the pathological case this will make a `git bisect run` invocation loop indefinitely between the first bisect step and the fast-forwarded post-merge HEAD. Add `--no-ff` to the merge command to avoid this issue. Signed-off-by: Mihail Atanassov Reviewed-by: Jonathan Nieder Signed-off-by: Junio C Hamano

Merge branch 'ak/bisect-doc-typofix'

2018-04-25T04:28:56Z

Docfix. * ak/bisect-doc-typofix: Documentation/git-bisect.txt: git bisect term → git bisect terms

Documentation/git-bisect.txt: git bisect term → git bisect terms

2018-04-07T11:50:19Z

Signed-off-by: Anders Kaseorg Signed-off-by: Junio C Hamano

bisect: mention "view" as an alternative to "visualize"

2017-11-13T01:51:14Z

Tweak a small number of files to mention "view" as an alternative to "visualize". Signed-off-by: Robert P. J. Day Signed-off-by: Junio C Hamano

git-bisect.txt: add missing word

2017-04-01T18:35:45Z

Signed-off-by: Quentin Pradet Signed-off-by: Junio C Hamano

Merge branch 'ad/bisect-terms'

2017-01-23T23:59:22Z

Documentation fix. * ad/bisect-terms: Documentation/bisect: improve on (bad|new) and (good|bad)

Documentation/bisect: improve on (bad|new) and (good|bad)

2017-01-13T19:15:38Z

The following part of the description: git bisect (bad|new) [] git bisect (good|old) [...] may be a bit confusing, as a reader may wonder if instead it should be: git bisect (bad|good) [] git bisect (old|new) [...] Of course the difference between "[]" and "[...]" should hint that there is a good reason for the way it is. But we can further clarify and complete the description by adding "" and "" to the "bad|new" and "good|old" alternatives. Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano

doc: typeset HEAD and variants as literal

2016-06-28T15:36:45Z

This is an application of the newly added CodingGuidelines to HEAD and variants like FETCH_HEAD. It was obtained with: perl -pi -e "s/'([A-Z_]*HEAD)'/\`\$1\`/g" *.txt Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano