GIT 1.5.5.3

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

diff --git a/Documentation/RelNotes-1.5.5.3.txt b/Documentation/RelNotes-1.5.5.3.txt
new file mode 100644 (file)
index 0000000..f22f98b
--- /dev/null
+++ b/Documentation/RelNotes-1.5.5.3.txt
@@ -0,0 +1,12 @@
+GIT v1.5.5.3 Release Notes
+==========================
+
+Fixes since v1.5.5.2
+--------------------
+
+ * "git send-email --compose" did not notice that non-ascii contents
+   needed some MIME magic.
+
+ * "git fast-export" did not export octopus merges correctly.
+
+Also comes with various documentation updates.

diff --git a/Documentation/git.txt b/Documentation/git.txt
index a070e078e75389d1ea252b8f1b80bb5bc707e1aa..ccaa655d1f25677474b8860077557c5242048629 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -46,10 +46,12 @@ Documentation for older releases are available here:
 * link:v1.5.5/git.html[documentation for release 1.5.5]
 
 * release notes for
 * link:v1.5.5/git.html[documentation for release 1.5.5]
 
 * release notes for

+  link:RelNotes-1.5.5.3.txt[1.5.5.3],
+  link:RelNotes-1.5.5.2.txt[1.5.5.2],

   link:RelNotes-1.5.5.1.txt[1.5.5.1],
   link:RelNotes-1.5.5.txt[1.5.5].
 
   link:RelNotes-1.5.5.1.txt[1.5.5.1],
   link:RelNotes-1.5.5.txt[1.5.5].
 

-* link:v1.5.5.1/git.html[documentation for release 1.5.5.1]
+* link:v1.5.5.3/git.html[documentation for release 1.5.5.3]

 
 * link:v1.5.4.5/git.html[documentation for release 1.5.4.5]
 
 
 * link:v1.5.4.5/git.html[documentation for release 1.5.4.5]
 

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index f60bab896bd9a54714eff3596e38c9ffb9d38ac8..45fc112de64911ab5c39a954b942b33f0b9afa5d 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=v1.5.5.GIT
+DEF_VER=v1.5.5.3.GIT

 
 LF='
 '
 
 LF='
 '

diff --git a/RelNotes b/RelNotes
index 94f784eb97d49aec6c08a70dee5d5eaaa59fbd40..6be0f7886fb537401471e9461aa5114fc75232bd 120000 (symlink)
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes-1.5.5.2.txt
\ No newline at end of file
+Documentation/RelNotes-1.5.5.3.txt
\ No newline at end of file