Git 2.0.3

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

diff --git a/Documentation/RelNotes/2.0.3.txt b/Documentation/RelNotes/2.0.3.txt
new file mode 100644 (file)
index 0000000..4047b46
--- /dev/null
+++ b/Documentation/RelNotes/2.0.3.txt
@@ -0,0 +1,17 @@
+Git v2.0.3 Release Notes
+========================
+
+ * An ancient rewrite passed a wrong pointer to a curl library
+   function in a rarely used code path.
+
+ * "filter-branch" left an empty single-parent commit that results when
+   all parents of a merge commit gets mapped to the same commit, even
+   under "--prune-empty".
+
+ * "log --show-signature" incorrectly decided the color to paint a
+   mergetag that was and was not correctly validated.
+
+ * "log --show-signature" did not pay attention to "--graph" option.
+
+Also a lot of fixes to the tests and some updates to the docs are
+included.

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 5a98d3fd451927dda07e76298bf45bbcb8797c3d..f95911ac449df6b7cba0f2c4993926a095f0837a 100644 (file)
--- 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:
 
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 

-* link:v2.0.2/git.html[documentation for release 2.0.2]
+* link:v2.0.3/git.html[documentation for release 2.0.3]

 
 * release notes for
 
 * release notes for

+  link:RelNotes/2.0.3.txt[2.0.3],

   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].
   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 b14f852c0c75da58c58cb8d7df5515aeba575870..0d1a86c831e64492c628c96d1394c281a7193a0b 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE

-DEF_VER=v2.0.2
+DEF_VER=v2.0.3

 
 LF='
 '
 
 LF='
 '

diff --git a/RelNotes b/RelNotes
index 7c4ae86d0f685ca3b07163e646c242fda3a32b3c..84ad4af9bc4f87cfa197cd02a7e812d6b402ebb5 120000 (symlink)
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.0.2.txt
\ No newline at end of file
+Documentation/RelNotes/2.0.3.txt
\ No newline at end of file