path: root/Documentation/Makefile
diff options
authorJ. Bruce Fields <>2007-01-08 00:23:49 (GMT)
committerJ. Bruce Fields <>2007-01-08 01:33:06 (GMT)
commitd19fbc3c171aa71a79b2ff0b654e3064c91628b8 (patch)
tree8226b4f70f272eaed7538e33d626e6aa2252bae1 /Documentation/Makefile
parent13e86efbeae5994a85cc482b3964db7298c5c6ea (diff)
Documentation: add git user's manual
The goals are: - Readable from beginning to end in order without having read any other git documentation beforehand. - Helpful section names and cross-references, so it's not too hard to skip around some if you need to. - Organized to allow it to grow much larger (unlike the tutorials) It's more liesurely than tutorial.txt, but tries to stay focused on practical how-to stuff. It adds a discussion of how to resolve merge conflicts, and partial instructions on setting up and dealing with a public repository. I've lifted a little bit from "branching and merging" (e.g., some of the discussion of history diagrams), and could probably steal more if that's OK. (Similarly anyone should of course feel free to reuse bits of this if any parts seem more useful than the whole.) There's a lot of detail on managing branches and using git-fetch, just because those are essential even to people needing read-only access (e.g., kernel testers). I think those sections will be much shorter once the new "git remote" command and the disconnected checkouts are taken into account. I do feel bad about adding yet another piece of documentation, but I we need something that goes through all the basics in a logical order, and I wasn't seeing how to grow the tutorials into that. Signed-off-by: "J. Bruce Fields" <>
Diffstat (limited to 'Documentation/Makefile')
1 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 93c7024..c2ee5b4 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -17,7 +17,7 @@ ARTICLES += hooks
ARTICLES += everyday
ARTICLES += git-tools
# with their own formatting rules.
-SP_ARTICLES = glossary howto/revert-branch-rebase
+SP_ARTICLES = glossary howto/revert-branch-rebase user-manual
DOC_HTML += $(patsubst %,%.html,$(ARTICLES) $(SP_ARTICLES))
@@ -89,6 +89,12 @@ clean:
%.xml : %.txt
asciidoc -b docbook -d manpage -f asciidoc.conf $<
+user-manual.xml: user-manual.txt user-manual.conf
+ asciidoc -b docbook -d book $<
+user-manual.html: user-manual.xml
+ xmlto -m /etc/asciidoc/docbook-xsl/xhtml.xsl html-nochunks $<
git.html: git.txt README
glossary.html : glossary.txt