summaryrefslogtreecommitdiff
path: root/git-bisect.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-08-28 00:28:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-08-28 00:28:31 (GMT)
commita1184d85e8752658f02746982822f43f32316803 (patch)
treef4508ca7d63ca7e71c3e99cac4e54945f777b1aa /git-bisect.sh
parent8d13caf795902812d44809e2f222fb2334030603 (diff)
parente596cdddf349b244dca854bf5a7aa9428b48fc50 (diff)
downloadgit-a1184d85e8752658f02746982822f43f32316803.zip
git-a1184d85e8752658f02746982822f43f32316803.tar.gz
git-a1184d85e8752658f02746982822f43f32316803.tar.bz2
Merge branch 'mv/merge-custom'
* mv/merge-custom: t7606: fix custom merge test Fix "git-merge -s bogo" help text Update .gitignore to ignore git-help Builtin git-help. builtin-help: always load_command_list() in cmd_help() Add a second testcase for handling invalid strategies in git-merge Add a new test for using a custom merge strategy builtin-merge: allow using a custom strategy builtin-help: make some internal functions available to other builtins Conflicts: help.c
Diffstat (limited to 'git-bisect.sh')
0 files changed, 0 insertions, 0 deletions