提交 8130949b 编写于 作者: J Junio C Hamano

Sync with 1.6.2.2

Signed-off-by: NJunio C Hamano <gitster@pobox.com>
......@@ -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.
......@@ -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).
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册