summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-10-29 17:48:38 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-10-29 17:48:45 (GMT)
commit49c3e926349e964b311b46251bb2b97d3d669855 (patch)
tree2cbcb3b3986f0f7887f7dc9e2fc438f6a676ceb5
parentebc2e5a593ce7082bed03b2d22e2fe83583a9f5d (diff)
downloadgit-49c3e926349e964b311b46251bb2b97d3d669855.zip
git-49c3e926349e964b311b46251bb2b97d3d669855.tar.gz
git-49c3e926349e964b311b46251bb2b97d3d669855.tar.bz2
Git 2.1.3v2.1.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes/2.1.3.txt26
-rw-r--r--Documentation/git.txt3
-rwxr-xr-xGIT-VERSION-GEN2
l---------RelNotes2
4 files changed, 30 insertions, 3 deletions
diff --git a/Documentation/RelNotes/2.1.3.txt b/Documentation/RelNotes/2.1.3.txt
new file mode 100644
index 0000000..acc9ebb
--- /dev/null
+++ b/Documentation/RelNotes/2.1.3.txt
@@ -0,0 +1,26 @@
+Git v2.1.3 Release Notes
+========================
+
+ * Some MUAs mangled a line in a message that begins with "From " to
+ ">From " when writing to a mailbox file and feeding such an input to
+ "git am" used to lose such a line.
+
+ * "git daemon" (with NO_IPV6 build configuration) used to incorrectly
+ use the hostname even when gethostbyname() reported that the given
+ hostname is not found.
+
+ * Newer versions of 'meld' breaks the auto-detection we use to see if
+ they are new enough to support the `--output` option.
+
+ * "git pack-objects" forgot to disable the codepath to generate
+ object recheability bitmap when it needs to split the resulting
+ pack.
+
+ * "gitweb" used deprecated CGI::startfrom, which was removed from
+ CGI.pm as of 4.04; use CGI::start_from instead.
+
+ * "git log" documentation had an example section marked up not
+ quite correctly, which passed AsciiDoc but failed with
+ AsciiDoctor.
+
+Also contains some documentation updates.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index c6175d4..5627845 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,9 +43,10 @@ unreleased) version of Git, that is available from the 'master'
branch of the `git.git` repository.
Documentation for older releases are available here:
-* link:v2.1.2/git.html[documentation for release 2.1.2]
+* link:v2.1.3/git.html[documentation for release 2.1.3]
* release notes for
+ link:RelNotes/2.1.3.txt[2.1.3],
link:RelNotes/2.1.2.txt[2.1.2],
link:RelNotes/2.1.1.txt[2.1.1],
link:RelNotes/2.1.0.txt[2.1].
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 14b866e..b0500c2 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.1.2
+DEF_VER=v2.1.3
LF='
'
diff --git a/RelNotes b/RelNotes
index f2706be..192f48c 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.1.2.txt \ No newline at end of file
+Documentation/RelNotes/2.1.3.txt \ No newline at end of file