summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-10-05 12:30:06 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-10-05 12:30:06 -0700
commit22dd6eb31f85afebce81c0687e7532e78a12aa9d (patch)
tree6da85e99fe1149c5c42a82b600f9132e670fc6fd /merge-recursive.h
parentMerge branch 'jc/rerere' (diff)
parentbisect: allow setting any user-specified in 'git bisect start' (diff)
downloadtgif-22dd6eb31f85afebce81c0687e7532e78a12aa9d.tar.xz
Merge branch 'ad/bisect-terms'
The use of 'good/bad' in "git bisect" made it confusing to use when hunting for a state change that is not a regression (e.g. bugfix). The command learned 'old/new' and then allows the end user to say e.g. "bisect start --term-old=fast --term=new=slow" to find a performance regression. Michael's idea to make 'good/bad' more intelligent does have certain attractiveness ($gname/272867), and makes some of the work on this topic a moot point. * ad/bisect-terms: bisect: allow setting any user-specified in 'git bisect start' bisect: add 'git bisect terms' to view the current terms bisect: add the terms old/new bisect: sanity check on terms
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions