summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorLibravatar Pranit Bauva <pranit.bauva@gmail.com>2021-02-03 22:54:38 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-02-03 14:52:09 -0800
commit97b8294474f8995ad67d57dbae6d524523a9ec2a (patch)
tree1fab576459fbae8fc8cb9b437f7792b99ff74d82 /Documentation/merge-strategies.txt
parentbisect--helper: reimplement `bisect_skip` shell function in C (diff)
downloadtgif-97b8294474f8995ad67d57dbae6d524523a9ec2a.tar.xz
bisect--helper: retire `--check-and-set-terms` subcommand
The `--check-and-set-terms` subcommand is no longer from the git-bisect.sh shell script. Instead the function `check_and_set_terms()` is called from the C implementation. Mentored-by: Lars Schneider <larsxschneider@gmail.com> Mentored-by: Christian Couder <chriscool@tuxfamily.org> Mentored-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Pranit Bauva <pranit.bauva@gmail.com> Signed-off-by: Tanushree Tumane <tanushreetumane@gmail.com> Signed-off-by: Miriam Rubio <mirucam@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions