summaryrefslogtreecommitdiff
path: root/t/t3411-rebase-preserve-around-merges.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-01-13 11:22:21 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-01-13 11:22:21 -0800
commit6845e8a62dca508819e9a95b9269054de8c7eda8 (patch)
tree3366596d645ff95ceb25bc3025fa1a83cad4b361 /t/t3411-rebase-preserve-around-merges.sh
parentpack-heuristics.txt: mark up the file header properly (diff)
parentcat-file: handle --batch format with missing type/size (diff)
downloadtgif-6845e8a62dca508819e9a95b9269054de8c7eda8.tar.xz
Merge branch 'jk/cat-file-regression-fix' into maint
"git cat-file --batch=", an admittedly useless command, did not behave very well. * jk/cat-file-regression-fix: cat-file: handle --batch format with missing type/size cat-file: pass expand_data to print_object_or_die
Diffstat (limited to 't/t3411-rebase-preserve-around-merges.sh')
0 files changed, 0 insertions, 0 deletions