Andrew's git / gitweb.git / diff
?
Merge branch 'maint-1.6.0' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 18 Jan 2009 06:39:49 +0000 (22:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 18 Jan 2009 06:39:49 +0000 (22:39 -0800)
* 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

1  2 
Documentation/githooks.txt patch | diff1 | diff2 | blob | history
builtin-commit.c patch | diff1 | diff2 | blob | history
builtin-fsck.c patch | diff1 | diff2 | blob | history
diff --cc Documentation/githooks.txt
Simple merge
diff --cc builtin-commit.c
Simple merge
diff --cc builtin-fsck.c
Simple merge