Merge branch 'master' into cc/help
authorJunio C Hamano <gitster@pobox.com>
Mon, 10 Dec 2007 09:22:42 +0000 (01:22 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Dec 2007 09:22:42 +0000 (01:22 -0800)
commit7be2b6e02b4f2a1b4812764f65b12cafb11a934e
treec94ad7eb3a4d478a1c71eb6ef0aaf1c0f7348660
parentc07a07c588fea82c2426d795a75324b3035c0a71
parent591aa2536fdbc4090ba8d4ca512d4ee7df4bf05d
Merge branch 'master' into cc/help

This is to primarily pull in MANPATH tweak and help.txt formatting fix
from the master branch.
Documentation/Makefile
Documentation/git-help.txt
Documentation/git.txt
Makefile
help.c