Merge branch 'lh/submodule'
authorJunio C Hamano <gitster@pobox.com>
Sat, 16 Jun 2007 08:22:35 +0000 (01:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 16 Jun 2007 08:22:35 +0000 (01:22 -0700)
* 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

1  2 
Documentation/Makefile
diff --combined Documentation/Makefile
index 4edf788c3a8ddf39638028447ca78624305da778,2ad18e0ac30680dff8bb82f0595ac235d3158015..cc563247a9faf54a8a6458ec0359620764fa3b9d
@@@ -2,7 -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))
@@@ -37,9 -37,6 +37,9 @@@ man7dir=$(mandir)/man
  
  ASCIIDOC=asciidoc
  ASCIIDOC_EXTRA =
 +ifdef ASCIIDOC8
 +ASCIIDOC_EXTRA += -a asciidoc7compatible
 +endif
  INSTALL?=install
  DOC_REF = origin/man