diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-05-06 11:00:46 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-05-06 11:00:46 -0700 |
commit | 606ee4be54b5ef3c8593a71b4b1bd6b4ee2d323d (patch) | |
tree | fd9957b9fef3c0165a0bb1b55708812c0395f12f /userdiff.h | |
parent | efa67bfd16f4260275654bc4194744dd65353350 (diff) | |
parent | 239b5ed9c9b7b7f219b05c8d71e29db7b970eb48 (diff) | |
download | git-606ee4be54b5ef3c8593a71b4b1bd6b4ee2d323d.tar.gz |
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
Diffstat (limited to 'userdiff.h')
0 files changed, 0 insertions, 0 deletions