Git 2.0.2

Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Jul 16, 2014 at 11:19 UTC ebc5da3208824e25a89672a3b91bd13629b215fe
3 files changed +22 -2
Documentation/RelNotes/2.0.2.txt
+19
@@ -11,3 +11,22 @@ Git v2.0.2 Release Notes
11 * Recent updates to "git repack" started to duplicate objects that
12 are in packfiles marked with .keep flag into the new packfile by
13 mistake.
14 +
15 + * "git clone -b brefs/tags/bar" would have mistakenly thought we were
16 + following a single tag, even though it was a name of the branch,
17 + because it incorrectly used strstr().
18 +
19 + * "%G" (nothing after G) is an invalid pretty format specifier, but
20 + the parser did not notice it as garbage.
21 +
22 + * Code to avoid adding the same alternate object store twice was
23 + subtly broken for a long time, but nobody seems to have noticed.
24 +
25 + * A handful of code paths had to read the commit object more than
26 + once when showing header fields that are usually not parsed. The
27 + internal data structure to keep track of the contents of the commit
28 + object has been updated to reduce the need for this double-reading,
29 + and to allow the caller find the length of the object.
30 +
31 + * During "git rebase --merge", a conflicted patch could not be
32 + skipped with "--skip" if the next one also conflicted.
Documentation/git.txt
+2 -1
@@ -43,9 +43,10 @@ unreleased) version of Git, that is available from 'master'
43 branch of the `git.git` repository.
44 Documentation for older releases are available here:
45
46 -* link:v2.0.1/git.html[documentation for release 2.0.1]
46 +* link:v2.0.2/git.html[documentation for release 2.0.2]
47
48 * release notes for
49 + link:RelNotes/2.0.2.txt[2.0.2],
50 link:RelNotes/2.0.1.txt[2.0.1],
51 link:RelNotes/2.0.0.txt[2.0.0].
52
GIT-VERSION-GEN
+1 -1
@@ -1,7 +1,7 @@
1 #!/bin/sh
2
3 GVF=GIT-VERSION-FILE
4 -DEF_VER=v2.0.1
4 +DEF_VER=v2.0.2
5
6 LF='
7 '