Skip to content

Commit 8130949

Browse files
committed
Sync with 1.6.2.2
Signed-off-by: Junio C Hamano <[email protected]>
2 parents a61c0ff + 3346330 commit 8130949

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

Documentation/RelNotes-1.6.2.2.txt

+9-6
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,15 @@ Fixes since v1.6.2.1
77
* A longstanding confusing description of what --pickaxe option of
88
git-diff does has been clarified in the documentation.
99

10+
* "git-blame -S" did not quite work near the commits that were given
11+
on the command line correctly.
12+
1013
* "git diff --pickaxe-regexp" did not count overlapping matches
1114
correctly.
1215

16+
* "git diff" did not feed files in work-tree representation to external
17+
diff and textconv.
18+
1319
* "git-fetch" in a repository that was not cloned from anywhere said
1420
it cannot find 'origin', which was hard to understand for new people.
1521

@@ -33,10 +39,7 @@ Fixes since v1.6.2.1
3339
* import-zips script (in contrib) did not compute the common directory
3440
prefix correctly.
3541

36-
Many small documentation updates are included as well.
42+
* miscompilation of negated enum constants by old gcc (2.9) affected the
43+
codepaths to spawn subprocesses.
3744

38-
---
39-
exec >/var/tmp/1
40-
O=v1.6.2.1-46-gb19293d
41-
echo O=$(git describe maint)
42-
git shortlog --no-merges $O..maint
45+
Many small documentation updates are included as well.

Documentation/RelNotes-1.6.3.txt

-6
Original file line numberDiff line numberDiff line change
@@ -121,15 +121,9 @@ release, unless otherwise noted.
121121
Here are fixes that this release has, but have not been backported to
122122
v1.6.2.X series.
123123

124-
* "git-blame -S" did not quite work near the commits that were given
125-
on the command line correctly (jc/maint-1.6.0-blame-s).
126-
127124
* The initial checkout did not read the attributes from the .gitattribute
128125
file that is being checked out.
129126

130-
* git-diff feeds files in work-tree representation to external diff and
131-
textconv (js/maint-diff-temp-smudge).
132-
133127
* git-gc spent excessive amount of time to decide if an object appears
134128
in a locally existing pack (if needed, backport by merging 69e020a).
135129

0 commit comments

Comments
 (0)