Merge branch 'js/info-man-path'
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2011 18:00:46 +0000 (11:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 May 2011 18:00:46 +0000 (11:00 -0700)
commit606ee4be54b5ef3c8593a71b4b1bd6b4ee2d323d
treefd9957b9fef3c0165a0bb1b55708812c0395f12f
parentefa67bfd16f4260275654bc4194744dd65353350
parent239b5ed9c9b7b7f219b05c8d71e29db7b970eb48
Merge branch 'js/info-man-path'

* js/info-man-path:
  Documentation: clarify meaning of --html-path, --man-path, and --info-path
  git: add --info-path and --man-path options

Conflicts:
Makefile
Documentation/git.txt
Makefile
git.c