![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 30 Dec 2009 09:24:12 +0000 (01:24 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 30 Dec 2009 09:24:12 +0000 (01:24 -0800) | ||
| commit | b0b3a241e2ca1ba5b928a128b6dcafb990df6e75 | |
| tree | f0631396a9ce6a1bdd3ef12f2c87cd47a7864cea | tree | snapshot |
| parent | f5e025a9d5b35e24768475f6890b836ce0d5ed15 | commit | diff |
| parent | 70d7099916c9621e157c620f9cc7fc982f109c55 | commit | diff |
Merge branch 'maint-1.6.1' into maint
* maint-1.6.1:
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
diff.c
* maint-1.6.1:
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
diff.c
| builtin-commit.c | diff1 | | diff2 | | blob | history |
| builtin-count-objects.c | diff1 | | diff2 | | blob | history |
| diff.c | diff1 | | diff2 | | blob | history |
| t/t7102-reset.sh | diff1 | | diff2 | | blob | history |