summaryrefslogtreecommitdiff
path: root/t/t9700
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-02-16 14:08:00 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-02-16 14:08:00 -0800
commit6c63ab3ca7abc50155acc6c28380435fb79f7fa9 (patch)
tree61f4f31ceb45e7be429055e9a34df66ba69d7764 /t/t9700
parentMerge branch 'mm/empty-loose-error-message' into maint (diff)
parentcommit: ignore intent-to-add entries instead of refusing (diff)
downloadtgif-6c63ab3ca7abc50155acc6c28380435fb79f7fa9.tar.xz
Merge branch 'jc/maint-commit-ignore-i-t-a' into maint
* jc/maint-commit-ignore-i-t-a: commit: ignore intent-to-add entries instead of refusing Conflicts: cache-tree.c
Diffstat (limited to 't/t9700')
0 files changed, 0 insertions, 0 deletions