summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-05-28 05:20:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-05-28 05:32:47 (GMT)
commit28bc30220f30850a10217d61f73e46d8a541e670 (patch)
tree65c021634c931a167f6971acf19b9077bedd78ac
parentd5350fd2b3a4721885bf1b3353478970caef268c (diff)
downloadgit-28bc30220f30850a10217d61f73e46d8a541e670.zip
git-28bc30220f30850a10217d61f73e46d8a541e670.tar.gz
git-28bc30220f30850a10217d61f73e46d8a541e670.tar.bz2
GIT 1.5.5.3v1.5.5.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes-1.5.5.3.txt12
-rw-r--r--Documentation/git.txt4
-rwxr-xr-xGIT-VERSION-GEN2
l---------RelNotes2
4 files changed, 17 insertions, 3 deletions
diff --git a/Documentation/RelNotes-1.5.5.3.txt b/Documentation/RelNotes-1.5.5.3.txt
new file mode 100644
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 a070e07..ccaa655 100644
--- 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: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: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]
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index f60bab8..45fc112 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v1.5.5.GIT
+DEF_VER=v1.5.5.3.GIT
LF='
'
diff --git a/RelNotes b/RelNotes
index 94f784e..6be0f78 120000
--- 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