![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 18 Jan 2009 06:39:49 +0000 (22:39 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 18 Jan 2009 06:39:49 +0000 (22:39 -0800) | ||
| commit | 78f111e12de40e2d9aa8d0774acc287f79862b13 | |
| tree | 1c7f08c0e2ee31b86a2bfa1c010f5d7bddc3d0fb | tree | snapshot |
| parent | 8ee09acd8f3c96683ce2b81bb8ac8079f0e8a4fd | commit | diff |
| parent | 3aed2fda6f8233895be0d1142c4c4b407fb692c3 | commit | diff |
Merge branch 'maint-1.6.0' into maint
* maint-1.6.0:
builtin-fsck: fix off by one head count
Documentation: let asciidoc align related options
githooks.txt: add missing word
builtin-commit.c: do not remove COMMIT_EDITMSG
* maint-1.6.0:
builtin-fsck: fix off by one head count
Documentation: let asciidoc align related options
githooks.txt: add missing word
builtin-commit.c: do not remove COMMIT_EDITMSG
| Documentation/githooks.txt | diff1 | | diff2 | | blob | history |
| builtin-commit.c | diff1 | | diff2 | | blob | history |
| builtin-fsck.c | diff1 | | diff2 | | blob | history |