Git 2.0.4

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

diff --git a/Documentation/RelNotes/2.0.4.txt b/Documentation/RelNotes/2.0.4.txt
new file mode 100644 (file)
index 0000000..7e34092
--- /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 f95911ac449df6b7cba0f2c4993926a095f0837a..cd509775ad71608921d5a72d4b34f09c9930c30f 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.3/git.html[documentation for release 2.0.3]
+* link:v2.0.4/git.html[documentation for release 2.0.4]

 
 * release notes for
 
 * 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],
   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 0d1a86c831e64492c628c96d1394c281a7193a0b..3e9d508273c3b7ce06274874470cfcbdcd5713a7 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.3
+DEF_VER=v2.0.4

 
 LF='
 '
 
 LF='
 '

diff --git a/RelNotes b/RelNotes
index 84ad4af9bc4f87cfa197cd02a7e812d6b402ebb5..76462ab9e8ed2f4896f683d3cceafb28781e9101 120000 (symlink)
--- 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