From: Junio C Hamano Date: Thu, 3 Dec 2009 08:37:56 +0000 (-0800) Subject: Merge in 1.6.5.4 X-Git-Tag: v1.6.6-rc2~16 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e21a8577089cb10fed5f298796ba3685010dfaef?ds=inline;hp=-c Merge in 1.6.5.4 Signed-off-by: Junio C Hamano --- e21a8577089cb10fed5f298796ba3685010dfaef diff --combined Documentation/Makefile index abb75eb136,d4c05ca879..e841ca96cb --- a/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))) @@@ -104,9 -103,12 +104,12 @@@ ifdef DOCBOOK_SUPPRESS_S XMLTO_EXTRA += -m manpage-suppress-sp.xsl endif - ifdef MAN_BASE_URL + # 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. XMLTO_EXTRA += --stringparam man.base.url.for.relative.links=$(MAN_BASE_URL) - endif # If your target system uses GNU groff, it may try to render # apostrophes as a "pretty" apostrophe using unicode. This breaks diff --combined Documentation/git.txt index 8e577cc4fe,7aa2edee58..36637afa06 --- a/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.3/git.html[documentation for release 1.6.5.3] + * link:v1.6.5.4/git.html[documentation for release 1.6.5.4] * release notes for + 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], link:RelNotes-1.6.5.1.txt[1.6.5.1], @@@ -240,10 -241,6 +241,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 ---------------------