summary refs log tree commit
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-07-16 11:19:56 -0700
committerJunio C Hamano <gitster@pobox.com>2014-07-16 11:19:56 -0700
commitebc5da3208824e25a89672a3b91bd13629b215fe (patch)
treeb6f020e308ffac31c5b446909db1cc94419b05ac
parent2e931843adb7ce59b5d9bc76f72edff7805980a9 (diff)
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.0.2.txt19
-rw-r--r--Documentation/git.txt3
-rwxr-xr-xGIT-VERSION-GEN2
3 files changed, 22 insertions, 2 deletions
diff --git a/Documentation/RelNotes/2.0.2.txt b/Documentation/RelNotes/2.0.2.txt
index c48c0aab27..8e8321b2ef 100644
--- a/Documentation/RelNotes/2.0.2.txt
+++ b/Documentation/RelNotes/2.0.2.txt
@@ -11,3 +11,22 @@ Git v2.0.2 Release Notes
  * Recent updates to "git repack" started to duplicate objects that
    are in packfiles marked with .keep flag into the new packfile by
    mistake.
+
+ * "git clone -b brefs/tags/bar" would have mistakenly thought we were
+   following a single tag, even though it was a name of the branch,
+   because it incorrectly used strstr().
+
+ * "%G" (nothing after G) is an invalid pretty format specifier, but
+   the parser did not notice it as garbage.
+
+ * Code to avoid adding the same alternate object store twice was
+   subtly broken for a long time, but nobody seems to have noticed.
+
+ * A handful of code paths had to read the commit object more than
+   once when showing header fields that are usually not parsed.  The
+   internal data structure to keep track of the contents of the commit
+   object has been updated to reduce the need for this double-reading,
+   and to allow the caller find the length of the object.
+
+ * During "git rebase --merge", a conflicted patch could not be
+   skipped with "--skip" if the next one also conflicted.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 3d9c6d1743..9d0883d28f 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,9 +43,10 @@ unreleased) version of Git, that is available from 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
-* link:v2.0.1/git.html[documentation for release 2.0.1]
+* link:v2.0.2/git.html[documentation for release 2.0.2]
 
 * release notes for
+  link:RelNotes/2.0.2.txt[2.0.2],
   link:RelNotes/2.0.1.txt[2.0.1],
   link:RelNotes/2.0.0.txt[2.0.0].
 
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 0986062473..b14f852c0c 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.0.1
+DEF_VER=v2.0.2
 
 LF='
 '