diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-06-16 01:22:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-06-16 01:22:35 -0700 |
| commit | ad2a2f6f0b40ba7c3dea8ec8ddcbc3f65f083998 (patch) | |
| tree | dee9b00895f51a10f5e3cddd768b099a04fb41c0 /Documentation/Makefile | |
| parent | 5bd148bfe8a4f2df8487e029cd4ee6809bc4c963 (diff) | |
| parent | a88ca3427770b9142db71c29154abcce4c5b8a9d (diff) | |
| download | git-ad2a2f6f0b40ba7c3dea8ec8ddcbc3f65f083998.tar.gz git-ad2a2f6f0b40ba7c3dea8ec8ddcbc3f65f083998.tar.xz | |
Merge branch 'lh/submodule'
* lh/submodule:
gitmodules(5): remove leading period from synopsis
Add gitmodules(5)
git-submodule: give submodules proper names
Rename sections from "module" to "submodule" in .gitmodules
git-submodule: remember to checkout after clone
t7400: barf if git-submodule removes or replaces a file
Diffstat (limited to 'Documentation/Makefile')
| -rw-r--r-- | Documentation/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile index 4edf788c3..cc563247a 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -2,7 +2,7 @@ MAN1_TXT= \ $(filter-out $(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \ $(wildcard git-*.txt)) \ gitk.txt -MAN5_TXT=gitattributes.txt gitignore.txt +MAN5_TXT=gitattributes.txt gitignore.txt gitmodules.txt MAN7_TXT=git.txt DOC_HTML=$(patsubst %.txt,%.html,$(MAN1_TXT) $(MAN5_TXT) $(MAN7_TXT)) |