From: Junio C Hamano <junkio@cox.net>
Date: Sat, 7 Apr 2007 08:30:43 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.2-rc0~79
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ced38ea252cb8b0315f4d2a54648b11c6c090657;p=git.git

Merge branch 'maint'

* maint:
  Documentation: tighten dependency for git.{html,txt}
  Makefile: iconv() on Darwin has the old interface
  t5300-pack-object.sh: portability issue using /usr/bin/stat
  t3200-branch.sh: small language nit
  usermanual.txt: some capitalization nits
  Make builtin-branch.c handle the git config file
  rename_ref(): only print a warning when config-file update fails
  Distinguish branches by more than case in tests.
  Avoid composing too long "References" header.
  cvsimport: Improve formating consistency
  cvsimport: Reorder options in documentation for better understanding
  cvsimport: Improve usage error reporting
  cvsimport: Improve documentation of CVSROOT and CVS module determination
  cvsimport: sync usage lines with existing options

Conflicts:

	Documentation/Makefile
---

ced38ea252cb8b0315f4d2a54648b11c6c090657
diff --cc Documentation/Makefile
index e82596dcd,ad87736b0..a637d8d55
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@@ -96,15 -94,11 +99,15 @@@ cmd-list.made: cmd-list.perl $(MAN1_TXT
  git.7 git.html: git.txt core-intro.txt
  
  clean:
 -	rm -f *.xml *.html *.1 *.7 howto-index.txt howto/*.html doc.dep
 +	rm -f *.xml *.xml+ *.html *.html+ *.1 *.7 howto-index.txt howto/*.html doc.dep
- 	rm -f $(cmds_txt)
+ 	rm -f $(cmds_txt) *.made
  
  %.html : %.txt
 -	$(ASCIIDOC) -b xhtml11 -d manpage -f asciidoc.conf $(ASCIIDOC_EXTRA) $<
 +	rm -f $@+ $@
 +	$(ASCIIDOC) -b xhtml11 -d manpage -f asciidoc.conf \
 +		$(ASCIIDOC_EXTRA) -o - $< | \
 +		sed -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' >$@+
 +	mv $@+ $@
  
  %.1 %.7 : %.xml
  	xmlto -m callouts.xsl man $<