summaryrefslogtreecommitdiff
path: root/t/t5515/refs.br-unconfig
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-01-18 21:29:47 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-01-18 21:29:47 -0800
commit011c181cc656c8b3e48882729d1b6238e8c5c537 (patch)
tree4f4a1c516c474ed6ff0327f852e783d0efa53667 /t/t5515/refs.br-unconfig
parentMerge branch 'maint-1.6.2' into maint-1.6.3 (diff)
parentMerge branch 'maint-1.6.1' into maint-1.6.2 (diff)
downloadtgif-011c181cc656c8b3e48882729d1b6238e8c5c537.tar.xz
Merge branch 'maint-1.6.2' into maint-1.6.3
* maint-1.6.2: base85: Make the code more obvious instead of explaining the non-obvious base85: encode_85() does not use the decode table base85 debug code: Fix length byte calculation checkout -m: do not try to fall back to --merge from an unborn branch branch: die explicitly why when calling "git branch [-a|-r] branchname". textconv: stop leaking file descriptors commit: --cleanup is a message option git count-objects: handle packs bigger than 4G t7102: make the test fail if one of its check fails Conflicts: diff.c
Diffstat (limited to 't/t5515/refs.br-unconfig')
0 files changed, 0 insertions, 0 deletions