Git 2.10.1

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

diff --git a/Documentation/RelNotes/2.10.1.txt b/Documentation/RelNotes/2.10.1.txt
index 73f3b978cf44f70c0fe7283a4978902a570200ee..70462f7f7e9bedd9a96359e5a88c08803e213da7 100644 (file)
--- a/Documentation/RelNotes/2.10.1.txt
+++ b/Documentation/RelNotes/2.10.1.txt
@@ -117,4 +117,15 @@ Fixes since v2.10
    been corrected to flip the executable bit for all paths that match
    the given pathspec.
 
    been corrected to flip the executable bit for all paths that match
    the given pathspec.
 

+ * "git pack-objects --include-tag" was taught that when we know that
+   we are sending an object C, we want a tag B that directly points at
+   C but also a tag A that points at the tag B.  We used to miss the
+   intermediate tag B in some cases.
+
+ * Documentation around tools to import from CVS was fairly outdated.
+
+ * In the codepath that comes up with the hostname to be used in an
+   e-mail when the user didn't tell us, we looked at ai_canonname
+   field in struct addrinfo without making sure it is not NULL first.
+

 Also contains minor documentation updates and code clean-ups.
 Also contains minor documentation updates and code clean-ups.

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 7913fc2513234ddf6f3f2f7e9e9543a2b698aa00..b8bec711f47918ad3dc7e05d318525819f3a51ab 100644 (file)
--- 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:
 
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 

-* link:v2.10.0/git.html[documentation for release 2.10]
+* link:v2.10.1/git.html[documentation for release 2.10.1]

 
 * release notes for
 
 * release notes for

+  link:RelNotes/2.10.1.txt[2.10.1],

   link:RelNotes/2.10.0.txt[2.10].
 
 * link:v2.9.3/git.html[documentation for release 2.9.3]
   link:RelNotes/2.10.0.txt[2.10].
 
 * link:v2.9.3/git.html[documentation for release 2.9.3]

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 6754ab076e649f0d728230869afcc45bcf6a4b3d..7d5c4771b4b3ef1af6cbde504c149a06ce173378 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.10.0
+DEF_VER=v2.10.1

 
 LF='
 '
 
 LF='
 '