![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 21 Jan 2011 22:38:48 +0000 (14:38 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 21 Jan 2011 22:38:48 +0000 (14:38 -0800) | ||
| commit | addf4429eca03df572acca6bdd1be28cd39f4627 | |
| tree | 280c94d8b49e8127896cb1fa9c0971cf87b761d4 | tree | snapshot |
| parent | 4bea95515a74fc2d2a11ae5f9e9aec97a1c3e5f3 | commit | diff |
| parent | 8c0db6fd51cec5fd82cf4054818c0a1ca4a58f37 | commit | diff |
Merge branch 'master' into next
* master:
Documentation: do not treat reset --keep as a special case
Correctly report corrupted objects
* master:
Documentation: do not treat reset --keep as a special case
Correctly report corrupted objects