Sync with 1.6.5.5

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --combined Documentation/Makefile
index 3f1042eebbccc0be289edc297a3fd8deea778d11,037220f544abb5fe9c3a98c313bdb10208a79166..4797b2dc3522ccd2050ddefe990268fddb6b8a47
--- 1/Documentation/Makefile
--- 2/Documentation/Makefile
+++ b/Documentation/Makefile
@@@ -17,7 -17,6 +17,7 @@@ DOC_HTML=$(MAN_HTML
  ARTICLES = howto-index
  ARTICLES += everyday
  ARTICLES += git-tools
 +ARTICLES += git-bisect-lk2009
  # with their own formatting rules.
  SP_ARTICLES = howto/revert-branch-rebase howto/using-merge-subtree user-manual
  API_DOCS = $(patsubst %.txt,%,$(filter-out technical/api-index-skel.txt technical/api-index.txt, $(wildcard technical/api-*.txt)))
@@@ -105,18 -104,15 +105,15 @@@ XMLTO_EXTRA += -m manpage-suppress-sp.x
  endif
  
  # Newer DocBook stylesheet emits warning cruft in the output when
- # this is not set, and if set it shows an absolute link.  We can
- # use MAN_BASE_URL=http://www.kernel.org/pub/software/scm/git/docs/
- # but distros may want to set it to /usr/share/doc/git-core/docs/ or
- # something like that.
+ # this is not set, and if set it shows an absolute link.  Older
+ # stylesheets simply ignore this parameter.
  #
- # As older stylesheets simply ignore this parameter, it ought to be
- # safe to set it to empty string when the base URL is not specified,
- # but unfortunately we cannot do so unconditionally because at least
- # xmlto 0.0.18 is reported to lack --stringparam option.
- ifdef MAN_BASE_URL
- XMLTO_EXTRA += --stringparam man.base.url.for.relative.links=$(MAN_BASE_URL)
+ # Distros may want to use MAN_BASE_URL=file:///path/to/git/docs/
+ # or similar.
+ ifndef MAN_BASE_URL
+ MAN_BASE_URL = file://$(htmldir)/
  endif
+ XMLTO_EXTRA += -m manpage-base-url.xsl
  
  # If your target system uses GNU groff, it may try to render
  # apostrophes as a "pretty" apostrophe using unicode.  This breaks
@@@ -245,6 -241,7 +242,7 @@@ clean
        $(RM) howto-index.txt howto/*.html doc.dep
        $(RM) technical/api-*.html technical/api-index.txt
        $(RM) $(cmds_txt) *.made
+       $(RM) manpage-base-url.xsl
  
  $(MAN_HTML): %.html : %.txt
        $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
@@@ -252,7 -249,10 +250,10 @@@
                $(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $< && \
        mv $@+ $@
  
- %.1 %.5 %.7 : %.xml
+ manpage-base-url.xsl: manpage-base-url.xsl.in
+       sed "s|@@MAN_BASE_URL@@|$(MAN_BASE_URL)|" $< > $@
+ 
+ %.1 %.5 %.7 : %.xml manpage-base-url.xsl
        $(QUIET_XMLTO)$(RM) $@ && \
        xmlto -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
  

diff --combined Documentation/git.txt
index 36637afa06c8d0a538fec9c99add78a1e3ff316a,8e93d35e440818b1181e72a7453602ae8d377fc9..ad6037baa0c69599250120842b06c3d1d5dc9857
--- 1/Documentation/git.txt
--- 2/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -10,7 -10,7 +10,7 @@@ SYNOPSI
  --------
  [verse]
  'git' [--version] [--exec-path[=GIT_EXEC_PATH]] [--html-path]
 -    [-p|--paginate|--no-pager]
 +    [-p|--paginate|--no-pager] [--no-replace-objects]
      [--bare] [--git-dir=GIT_DIR] [--work-tree=GIT_WORK_TREE]
      [--help] COMMAND [ARGS]
  
@@@ -43,9 -43,10 +43,10 @@@ unreleased) version of git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
- * link:v1.6.5.4/git.html[documentation for release 1.6.5.4]
+ * link:v1.6.5.5/git.html[documentation for release 1.6.5.5]
  
  * release notes for
+   link:RelNotes-1.6.5.5.txt[1.6.5.5],
    link:RelNotes-1.6.5.4.txt[1.6.5.4],
    link:RelNotes-1.6.5.3.txt[1.6.5.3],
    link:RelNotes-1.6.5.2.txt[1.6.5.2],
@@@ -241,10 -242,6 +242,10 @@@ help ...`
        environment is not set, it is set to the current working
        directory.
  
 +--no-replace-objects::
 +      Do not use replacement refs to replace git objects. See
 +      linkgit:git-replace[1] for more information.
 +
  
  FURTHER DOCUMENTATION
  ---------------------

diff --combined builtin-rerere.c
index 343d6cde48266d63c0aa6826b973e55b48820745,31fda73ae720e7c3d1abfa149e3259f179454f73..2be9ffb77b38ae687537f3599c9d11e3fbc026a9
--- 1/builtin-rerere.c
--- 2/builtin-rerere.c
+++ b/builtin-rerere.c
@@@ -48,6 -48,8 +48,8 @@@ static void garbage_collect(struct stri
  
        git_config(git_rerere_gc_config, NULL);
        dir = opendir(git_path("rr-cache"));
+       if (!dir)
+               die_errno("unable to open rr-cache directory");
        while ((e = readdir(dir))) {
                if (is_dot_or_dotdot(e->d_name))
                        continue;
@@@ -106,9 -108,6 +108,9 @@@ int cmd_rerere(int argc, const char **a
        if (argc < 2)
                return rerere();
  
 +      if (!strcmp(argv[1], "-h"))
 +              usage(git_rerere_usage);
 +
        fd = setup_rerere(&merge_rr);
        if (fd < 0)
                return 0;