summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-10-03 13:32:41 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-10-03 13:32:41 -0700
commit0cf36115dce7438a0eafad54a81cc57175e8fb54 (patch)
tree7494cbfa306ae1e84e624bd3ae36f7ddbb9d7a2e /Documentation
parentSeventh batch for 2.11 (diff)
parentGit 2.10.1 (diff)
downloadtgif-0cf36115dce7438a0eafad54a81cc57175e8fb54.tar.xz
Sync with 2.10.1
* maint: Git 2.10.1
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/RelNotes/2.10.1.txt11
-rw-r--r--Documentation/git.txt3
2 files changed, 13 insertions, 1 deletions
diff --git a/Documentation/RelNotes/2.10.1.txt b/Documentation/RelNotes/2.10.1.txt
index 73f3b978cf..70462f7f7e 100644
--- 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.
+ * "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.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 7913fc2513..b8bec711f4 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.10.0/git.html[documentation for release 2.10]
+* link:v2.10.1/git.html[documentation for release 2.10.1]
* 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]