git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f5e025a 70d7099)
Merge branch 'maint-1.6.1' into maint
authorJunio C Hamano <redacted>
Wed, 30 Dec 2009 09:24:12 +0000 (01:24 -0800)
committerJunio C Hamano <redacted>
Wed, 30 Dec 2009 09:24:12 +0000 (01:24 -0800)
commitb0b3a241e2ca1ba5b928a128b6dcafb990df6e75
treef0631396a9ce6a1bdd3ef12f2c87cd47a7864ceatree | snapshot
parentf5e025a9d5b35e24768475f6890b836ce0d5ed15commit | diff
parent70d7099916c9621e157c620f9cc7fc982f109c55commit | 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
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
git clone https://git.99rst.org/PROJECT