summaryrefslogtreecommitdiff
path: root/t/t5515/refs.br-branches-one-merge_branches-one
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-01-18 21:37:06 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-01-18 21:37:06 -0800
commit814035c12a07927ea03350184a14f869cdce7276 (patch)
tree2bd7e76205be964e7379cc2d9fd2e7dc71003599 /t/t5515/refs.br-branches-one-merge_branches-one
parentMerge commit 'v1.6.4.4-8-g8de6518' into maint-1.6.4 (diff)
parentMerge branch 'maint-1.6.2' into maint-1.6.3 (diff)
downloadtgif-814035c12a07927ea03350184a14f869cdce7276.tar.xz
Merge branch 'maint-1.6.3' into maint-1.6.4
* maint-1.6.3: 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: builtin-commit.c
Diffstat (limited to 't/t5515/refs.br-branches-one-merge_branches-one')
0 files changed, 0 insertions, 0 deletions