summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-07-30 14:19:53 -0700
committerJunio C Hamano <gitster@pobox.com>2014-07-30 14:19:53 -0700
commit32f56600bb6ac6fc57183e79d2c1515dfa56672f (patch)
treed71a8c1838cc192219c191fde10e2cd27f9dde9c
parentd8b396e17ecfe28b39b5f4470f791c434cce40ec (diff)
downloadgit-32f56600bb6ac6fc57183e79d2c1515dfa56672f.tar.gz
Git 2.0.4v2.0.4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.0.4.txt5
-rw-r--r--Documentation/git.txt3
-rwxr-xr-xGIT-VERSION-GEN2
l---------RelNotes2
4 files changed, 9 insertions, 3 deletions
diff --git a/Documentation/RelNotes/2.0.4.txt b/Documentation/RelNotes/2.0.4.txt
new file mode 100644
index 0000000000..7e340921a2
--- /dev/null
+++ b/Documentation/RelNotes/2.0.4.txt
@@ -0,0 +1,5 @@
+Git v2.0.4 Release Notes
+========================
+
+ * An earlier update to v2.0.2 broken output from "git diff-tree",
+ which is fixed in this release.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index f95911ac44..cd509775ad 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.3/git.html[documentation for release 2.0.3]
+* link:v2.0.4/git.html[documentation for release 2.0.4]
* release notes for
+ link:RelNotes/2.0.4.txt[2.0.4],
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],
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 0d1a86c831..3e9d508273 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.0.3
+DEF_VER=v2.0.4
LF='
'
diff --git a/RelNotes b/RelNotes
index 84ad4af9bc..76462ab9e8 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.0.3.txt \ No newline at end of file
+Documentation/RelNotes/2.0.4.txt \ No newline at end of file