Use Daniel's read-tree in the merge strategy 'resolve'.

diff --git a/Documentation/Makefile b/Documentation/Makefile
index bd6833b79ef1354c05062fb063d335dcb6bb8511..b81a6a2c72c93725c48fbbf9e7ec25e80052e87a 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -2,9 +2,18 @@ MAN1_TXT=$(wildcard git-*.txt) gitk.txt
 MAN7_TXT=git.txt
 
 DOC_HTML=$(patsubst %.txt,%.html,$(MAN1_TXT) $(MAN7_TXT))
-DOC_HTML += glossary.html
-DOC_HTML += tutorial.html
-DOC_HTML += howto-index.html
+
+ARTICLES = tutorial
+ARTICLES += cvs-migration
+ARTICLES += diffcore
+ARTICLES += howto-index
+ARTICLES += repository-layout
+ARTICLES += hooks
+# with their own formatting rules.
+SP_ARTICLES = glossary howto/revert-branch-rebase
+
+DOC_HTML += $(patsubst %,%.html,$(ARTICLES) $(SP_ARTICLES))
+
 DOC_MAN1=$(patsubst %.txt,%.1,$(MAN1_TXT))
 DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT))
 
@@ -45,7 +54,7 @@ git-diff-%.txt: diff-format.txt diff-options.txt
        touch $@
 
 clean:
-       rm -f *.xml *.html *.1 *.7 howto-index.txt
+       rm -f *.xml *.html *.1 *.7 howto-index.txt howto/*.html
 
 %.html : %.txt
        asciidoc -b xhtml11 -d manpage $<
@@ -56,23 +65,27 @@ clean:
 %.xml : %.txt
        asciidoc -b docbook -d manpage $<
 
+git.html: git.txt ../README
+
 glossary.html : glossary.txt sort_glossary.pl
        cat $< | \
        perl sort_glossary.pl | \
        asciidoc -b xhtml11 - > glossary.html
 
-tutorial.html : tutorial.txt
-       asciidoc -b xhtml11 tutorial.txt
-
 howto-index.txt: howto-index.sh $(wildcard howto/*.txt)
        rm -f $@+ $@
        sh ./howto-index.sh $(wildcard howto/*.txt) >$@+
        mv $@+ $@
 
-howto-index.html: howto-index.txt
-       asciidoc -b xhtml11 howto-index.txt
+$(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt
+       asciidoc -b xhtml11 $*.txt
 
 WEBDOC_DEST = /pub/software/scm/git/docs
 
+$(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt
+       rm -f $@+ $@
+       sed -e '1,/^$$/d' $? | asciidoc -b xhtml11 - >$@+
+       mv $@+ $@
+
 install-webdoc : html
        sh ./install-webdoc.sh $(WEBDOC_DEST)