aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-05-27 22:22:47 -0700
committerJunio C Hamano <gitster@pobox.com>2008-05-27 22:34:19 -0700
commitb71ce7f3f13ebd0e212bdda82b012ee36df4f63f (patch)
tree770119a6f5ba788a15fd91b3ad29490b94a86e43 /Documentation
parent37b78c25476d752953dc541e46fbb6bd5017edf7 (diff)
parent28bc30220f30850a10217d61f73e46d8a541e670 (diff)
downloadgit-b71ce7f3f13ebd0e212bdda82b012ee36df4f63f.tar.gz
git-b71ce7f3f13ebd0e212bdda82b012ee36df4f63f.tar.xz
Merge 1.5.5.3 in
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/RelNotes-1.5.5.3.txt12
-rw-r--r--Documentation/git-bundle.txt2
-rw-r--r--Documentation/git.txt3
3 files changed, 15 insertions, 2 deletions
diff --git a/Documentation/RelNotes-1.5.5.3.txt b/Documentation/RelNotes-1.5.5.3.txt
new file mode 100644
index 000000000..f22f98b73
--- /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-bundle.txt b/Documentation/git-bundle.txt
index 505ac056e..18330cdcd 100644
--- a/Documentation/git-bundle.txt
+++ b/Documentation/git-bundle.txt
@@ -9,7 +9,7 @@ git-bundle - Move objects and refs by archive
SYNOPSIS
--------
[verse]
-'git-bundle' create <file> [git-rev-list args]
+'git-bundle' create <file> <git-rev-list args>
'git-bundle' verify <file>
'git-bundle' list-heads <file> [refname...]
'git-bundle' unbundle <file> [refname...]
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 1f68dec54..7182bb7f7 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -46,11 +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.2/git.html[documentation for release 1.5.5.2]
+* 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]