From: Junio C Hamano Date: Thu, 2 Apr 2009 05:35:00 +0000 (-0700) Subject: Merge branch 'cj/doc-format' X-Git-Tag: v1.6.3-rc0~51 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/477fde6ff3262a132f03376f86c9727c0f411723?ds=inline;hp=-c Merge branch 'cj/doc-format' * cj/doc-format: Documentation: use "spurious .sp" XSLT if DOCBOOK_SUPPRESS_SP is set Documentation: option to render literal text as bold for manpages Documentation: asciidoc.conf: fix verse block with block titles Documentation: asciidoc.conf: always use for [blocktext] Documentation: move "spurious .sp" code into manpage-base.xsl Documentation: move quieting params into manpage-base.xsl Documentation: rename docbook-xsl-172 attribute to git-asciidoc-no-roff Documentation: use parametrized manpage-base.xsl with manpage-{1.72,normal}.xsl Documentation: move callouts.xsl to manpage-{base,normal}.xsl Documentation/Makefile: break up texi pipeline Documentation/Makefile: make most operations "quiet" --- 477fde6ff3262a132f03376f86c9727c0f411723 diff --combined Documentation/RelNotes-1.6.3.txt index f0a2e41c71,95405907b8..0c8a14ea93 --- a/Documentation/RelNotes-1.6.3.txt +++ b/Documentation/RelNotes-1.6.3.txt @@@ -22,12 -22,12 +22,12 @@@ branch pointed at by its HEAD, gets a l should happen upon such a push by setting the configuration variable receive.denyDeleteCurrent in the receiving repository. -In a future release, the default of "git push" without further -arguments might be changed. Currently, it will push all matching -refspecs to the current remote. A configuration variable push.default -has been introduced to select the default behaviour. To ease the -transition, a big warning is issued if this is not configured and a -git push without arguments is attempted. +When the user does not tell "git push" what to push, it has always +pushed matching refs. For some people it is unexpected, and a new +configuration variable push.default has been introduced to allow +changing a different default behaviour. To advertise the new feature, +a big warning is issued if this is not configured and a git push without +arguments is attempted. Updates since v1.6.2 @@@ -46,9 -46,6 +46,9 @@@ repositories. It may not be useful in practice; meant primarily for testing. +* http transport learned to prompt and use password when fetching from or + pushing to http://user@host.xz/ URL. + * (msysgit) progress output that is sent over the sideband protocol can be handled appropriately in Windows console. @@@ -102,11 -99,14 +102,16 @@@ * Test scripts can be run under valgrind. +* Test scripts can be run with installed git. + * Makefile learned 'coverage' option to run the test suites with coverage tracking enabled. + * Building the manpages with docbook-xsl between 1.69.1 and 1.71.1 now + requires setting DOCBOOK_SUPPRESS_SP to work around a docbook-xsl bug. + This workaround used to be enabled by default, but causes problems + with newer versions of docbook-xsl. + Fixes since v1.6.2 ------------------ @@@ -116,20 -116,11 +121,20 @@@ release, unless otherwise noted Here are fixes that this release has, but have not been backported to v1.6.2.X series. +* "git-blame -S" did not quite work near the commits that were given + on the command line correctly (jc/maint-1.6.0-blame-s). + +* The initial checkout did not read the attributes from the .gitattribute + file that is being checked out. + +* git-diff feeds files in work-tree representation to external diff and + textconv (js/maint-diff-temp-smudge). + * git-gc spent excessive amount of time to decide if an object appears in a locally existing pack (if needed, backport by merging 69e020a). --- exec >/var/tmp/1 -O=v1.6.2.1-213-g7d4e3a7 +O=v1.6.2.1-399-gaa72a14 echo O=$(git describe master) git shortlog --no-merges $O..master ^maint