Merge branch 'maint'

86c3e6ed · Junio C Hamano · b3cf6f3b · c2999adc · 86c3e6ed
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

Documentation/Makefile Documentation/Makefile +1 -1

未找到文件。
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -331,7 +331,7 @@ $(patsubst %.txt,%.texi,$(MAN_TXT)): %.texi : %.xml

 howto-index.txt: howto-index.sh $(wildcard howto/*.txt)
 	$(QUIET_GEN)$(RM) $@+ $@ && \
-	'$(SHELL_PATH_SQ)' ./howto-index.sh $(wildcard howto/*.txt) >$@+ && \
+	'$(SHELL_PATH_SQ)' ./howto-index.sh $(sort $(wildcard howto/*.txt)) >$@+ && \
 	mv $@+ $@

 $(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt