summaryrefslogtreecommitdiff
path: root/t/t7611-merge-abort.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-02-10 14:20:08 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-02-10 14:20:08 -0800
commit722c9244452c1853f0592b22c331382c282768c7 (patch)
tree51f432011324a752a2c57080e045a1fa7ad12c3f /t/t7611-merge-abort.sh
parentMerge branch 'aw/push-force-with-lease-reporting' (diff)
parentapply, ls-files: simplify "-z" parsing (diff)
downloadtgif-722c9244452c1853f0592b22c331382c282768c7.tar.xz
Merge branch 'jk/options-cleanup'
Various clean-ups to the command line option parsing. * jk/options-cleanup: apply, ls-files: simplify "-z" parsing checkout-index: disallow "--no-stage" option checkout-index: handle "--no-index" option checkout-index: handle "--no-prefix" option checkout-index: simplify "-z" option parsing give "nbuf" strbuf a more meaningful name
Diffstat (limited to 't/t7611-merge-abort.sh')
0 files changed, 0 insertions, 0 deletions