From: Junio C Hamano Date: Thu, 2 Apr 2009 19:35:48 +0000 (-0700) Subject: Sync with 1.6.2.2 X-Git-Tag: v1.6.3-rc0~44 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8130949bdc9c36f527148205b86a2ffe551cac53?hp=a61c0ffa4474ad6dcec18a5454630371106710f4 Sync with 1.6.2.2 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/RelNotes-1.6.2.2.txt b/Documentation/RelNotes-1.6.2.2.txt index 4f4c47341f..fafa9986b0 100644 --- a/Documentation/RelNotes-1.6.2.2.txt +++ b/Documentation/RelNotes-1.6.2.2.txt @@ -7,9 +7,15 @@ Fixes since v1.6.2.1 * A longstanding confusing description of what --pickaxe option of git-diff does has been clarified in the documentation. +* "git-blame -S" did not quite work near the commits that were given + on the command line correctly. + * "git diff --pickaxe-regexp" did not count overlapping matches correctly. +* "git diff" did not feed files in work-tree representation to external + diff and textconv. + * "git-fetch" in a repository that was not cloned from anywhere said it cannot find 'origin', which was hard to understand for new people. @@ -33,10 +39,7 @@ Fixes since v1.6.2.1 * import-zips script (in contrib) did not compute the common directory prefix correctly. -Many small documentation updates are included as well. +* miscompilation of negated enum constants by old gcc (2.9) affected the + codepaths to spawn subprocesses. ---- -exec >/var/tmp/1 -O=v1.6.2.1-46-gb19293d -echo O=$(git describe maint) -git shortlog --no-merges $O..maint +Many small documentation updates are included as well. diff --git a/Documentation/RelNotes-1.6.3.txt b/Documentation/RelNotes-1.6.3.txt index 0c8a14ea93..bcbd7c5a21 100644 --- a/Documentation/RelNotes-1.6.3.txt +++ b/Documentation/RelNotes-1.6.3.txt @@ -121,15 +121,9 @@ 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).