summaryrefslogtreecommitdiff
path: root/ll-merge.h
diff options
context:
space:
mode:
authorLibravatar Aaron Lipman <alipman88@gmail.com>2020-08-07 17:58:37 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-08-07 15:13:03 -0700
commite8861ffc203fe5ea3da97210e60b2e886002f218 (patch)
tree727cc7692a4e80c85631cfc3f997fa83cdf22a0a /ll-merge.h
parentcmd_bisect__helper: defer parsing no-checkout flag (diff)
downloadtgif-e8861ffc203fe5ea3da97210e60b2e886002f218.tar.xz
bisect: introduce first-parent flag
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 <alipman88@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions