Merge branch 'cc/help'
authorJunio C Hamano <gitster@pobox.com>
Thu, 13 Dec 2007 01:46:16 +0000 (17:46 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 13 Dec 2007 01:46:16 +0000 (17:46 -0800)
* cc/help:
RPM spec: Adjust htmldir
git-help -w: do not require to be in git repository
git.spec.in: remove python_path
Documentation: rename git.texi to user-manual.texi
Add git-browse-help to .gitignore
git-help -i: show info documentation from matching version of git
git-help -i: invoke info with document and node name
Documentation: add gitman.info target
Documentation: describe -w/--web option to "git-help".
Use {web,instaweb,help}.browser config options.
git-help: add -w|--web option to display html man page in a browser.
Documentation: describe -i/--info option to "git-help"
git-help: add -i|--info option to display info page.

1  2 
Makefile
diff --cc Makefile
Simple merge