Re: manpage name conflict
From: Sebastian Kuzminsky <hidden>
Date: 2016-06-15 22:41:57
Linus Torvalds [off-list ref] wrote:
On Thu, 19 May 2005, Sebastian Kuzminsky wrote:quoted
Anyway, here's the documentation patch:It's whitespace-corrupted, with tabs turned into spaces..
<blush> Index: Documentation/Makefile ===================================================================
--- 75b95bec390d6728b9b1b4572056af8cee34ea7d/Documentation/Makefile (mode:100644)
+++ uncommitted/Documentation/Makefile (mode:100644)@@ -1,6 +1,6 @@ DOC_SRC=$(wildcard git*.txt) DOC_HTML=$(patsubst %.txt,%.html,$(DOC_SRC)) -DOC_MAN=$(patsubst %.txt,%.1,$(DOC_SRC)) +DOC_MAN=$(patsubst %.txt,%.1,$(wildcard git-*.txt)) git.7 all: $(DOC_HTML) $(DOC_MAN)
@@ -13,13 +13,15 @@ touch $@ clean: - rm -f *.xml *.html *.1 + rm -f *.xml *.html *.1 *.7 %.html : %.txt asciidoc -b css-embedded -d manpage $< -%.1 : %.xml +%.1 %.7 : %.xml xmlto man $< + # FIXME: this next line works around an output filename bug in asciidoc 6.0.3 + [ "$@" = "git.7" ] || mv git.1 $@ %.xml : %.txt asciidoc -b docbook -d manpage $<
Index: Documentation/git-diff-helper.txt ===================================================================
--- 75b95bec390d6728b9b1b4572056af8cee34ea7d/Documentation/git-diff-helper.txt (mode:100644)
+++ uncommitted/Documentation/git-diff-helper.txt (mode:100644)@@ -1,5 +1,5 @@ git-diff-helper(1) -======================= +================== v0.1, May 2005 NAME
Index: Documentation/git.txt ===================================================================
--- 75b95bec390d6728b9b1b4572056af8cee34ea7d/Documentation/git.txt (mode:100644)
+++ uncommitted/Documentation/git.txt (mode:100644)@@ -1,4 +1,4 @@ -git(1) +git(7) ====== v0.1, May 2005
--
Sebastian Kuzminsky
"Marie will know I'm headed south, so's to meet me by and by"
-Townes Van Zandt