summaryrefslogtreecommitdiff
path: root/Documentation/Makefile
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@frugalware.org>2008-01-15 00:35:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-01-15 02:04:51 (GMT)
commit471a5ce5dda5c4315fe0f1d5ad3c642fc1ff540c (patch)
treea0aacee8ef218169f1d526730cc457337a740b51 /Documentation/Makefile
parent11c57e6a9a0f31f970701a673adaa1826f502fa0 (diff)
downloadgit-471a5ce5dda5c4315fe0f1d5ad3c642fc1ff540c.zip
git-471a5ce5dda5c4315fe0f1d5ad3c642fc1ff540c.tar.gz
git-471a5ce5dda5c4315fe0f1d5ad3c642fc1ff540c.tar.bz2
Add using merge subtree How-To
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/Makefile')
-rw-r--r--Documentation/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 7b0685b..7a32546 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -23,7 +23,7 @@ ARTICLES += everyday
ARTICLES += git-tools
ARTICLES += glossary
# with their own formatting rules.
-SP_ARTICLES = howto/revert-branch-rebase user-manual
+SP_ARTICLES = howto/revert-branch-rebase howto/using-merge-subtree user-manual
API_DOCS = $(patsubst %.txt,%,$(filter-out technical/api-index-skel.txt technical/api-index.txt, $(wildcard technical/api-*.txt)))
SP_ARTICLES += $(API_DOCS)
SP_ARTICLES += technical/api-index