diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-04-28 16:57:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-28 16:57:32 -0700 |
| commit | 89719209f48fe7d9694710795b1ec1d5fd7ebfc0 (patch) | |
| tree | 4c264196192c6aa0b3a60d337f43ec082add3293 /Documentation/Makefile | |
| parent | Merge branch 'fix' (diff) | |
| parent | Fix trivial typo in git-log man page. (diff) | |
| download | tgif-89719209f48fe7d9694710795b1ec1d5fd7ebfc0.tar.xz | |
Merge branch 'fix'
* fix:
Fix trivial typo in git-log man page.
Properly render asciidoc "callouts" in git man pages.
Fix up remaining man pages that use asciidoc "callouts".
Update the git-branch man page to include the "-r" option,
annotate: display usage information if no filename was given
annotate: fix warning about uninitialized scalar
git-am --resolved: more usable error message.
Diffstat (limited to 'Documentation/Makefile')
| -rw-r--r-- | Documentation/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile index f4cbf7e159..c1af22ce04 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -79,7 +79,7 @@ clean: asciidoc -b xhtml11 -d manpage -f asciidoc.conf $< %.1 %.7 : %.xml - xmlto man $< + xmlto -m callouts.xsl man $< %.xml : %.txt asciidoc -b docbook -d manpage -f asciidoc.conf $< |