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

diff --cc Documentation/Makefile
index e82596dcdf0545d528806797c990e101d40f1436,ad87736b0c0fbbaf6d2271fd66148f9e483c57bd..a637d8d559b6a41505e5381b92d523e55f4b3be8
--- 1/Documentation/Makefile
--- 2/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 $<

diff --cc Makefile
Simple merge