summaryrefslogtreecommitdiff
path: root/Documentation/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-05-09 00:37:27 +0900
committerJunio C Hamano <gitster@pobox.com>2019-05-09 00:37:27 +0900
commitcaa227ff458f34155ef4e974ba9e57c857c02c01 (patch)
treed5710ac6b84f68bfbbdca6dc0501e96e943fe7e0 /Documentation/Makefile
parentf560a4d1598106258f43d0d5cc04cae3e6aa93e2 (diff)
parentb7ce24d09526d4e181920ee029c25438196c2847 (diff)
downloadgit-caa227ff458f34155ef4e974ba9e57c857c02c01.tar.gz
Merge branch 'js/misc-doc-fixes'
"make check-docs", "git help -a", etc. did not account for cases where a particular build may deliberately omit some subcommands, which has been corrected. * js/misc-doc-fixes: Turn `git serve` into a test helper test-tool: handle the `-C <directory>` option just like `git` check-docs: do not bother checking for legacy scripts' documentation docs: exclude documentation for commands that have been excluded check-docs: allow command-list.txt to contain excluded commands help -a: do not list commands that are excluded from the build Makefile: drop the NO_INSTALL variable remote-testgit: move it into the support directory for t5801
Diffstat (limited to 'Documentation/Makefile')
-rw-r--r--Documentation/Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 6d738f831e..dbf5a0f276 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -7,7 +7,10 @@ ARTICLES =
SP_ARTICLES =
OBSOLETE_HTML =
+-include GIT-EXCLUDED-PROGRAMS
+
MAN1_TXT += $(filter-out \
+ $(patsubst %,%.txt,$(EXCLUDED_PROGRAMS)) \
$(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \
$(wildcard git-*.txt))
MAN1_TXT += git.txt