summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-07-23 18:33:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-07-23 18:33:16 (GMT)
commit740c281d21ef5b27f6f1b942a4f2fc20f51e8c7e (patch)
tree29118e47a825de541edae8439fadabb5ad34131e
parent98b12a4b9ab319be5bd3dcd003069e8720b8e7a5 (diff)
downloadgit-740c281d21ef5b27f6f1b942a4f2fc20f51e8c7e.zip
git-740c281d21ef5b27f6f1b942a4f2fc20f51e8c7e.tar.gz
git-740c281d21ef5b27f6f1b942a4f2fc20f51e8c7e.tar.bz2
Git 2.0.3v2.0.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.0.3.txt17
-rw-r--r--Documentation/git.txt3
-rwxr-xr-xGIT-VERSION-GEN2
l---------RelNotes2
4 files changed, 21 insertions, 3 deletions
diff --git a/Documentation/RelNotes/2.0.3.txt b/Documentation/RelNotes/2.0.3.txt
new file mode 100644
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 5a98d3f..f95911a 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.2/git.html[documentation for release 2.0.2]
+* link:v2.0.3/git.html[documentation for release 2.0.3]
* 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].
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index b14f852..0d1a86c 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.0.2
+DEF_VER=v2.0.3
LF='
'
diff --git a/RelNotes b/RelNotes
index 7c4ae86..84ad4af 120000
--- 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