summaryrefslogtreecommitdiff
path: root/color.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-10 00:49:47 -0800
committerJunio C Hamano <gitster@pobox.com>2010-01-10 00:49:47 -0800
commitc5034673fd92b6278e6c9d55683770ec01fafc89 (patch)
tree04435179aa4d3dfb0b2ac746072731929d7adcf1 /color.h
parent405923761a8cd12d0047c215b69df9c6aa96723e (diff)
parent96aa7adda3b0254e4b9904f53bb38cd76bfea7bb (diff)
downloadgit-c5034673fd92b6278e6c9d55683770ec01fafc89.tar.gz
Merge branch 'maint-1.6.1' into maint-1.6.2
* maint-1.6.1: 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 'color.h')
0 files changed, 0 insertions, 0 deletions