summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-23 21:49:14 -0700
committerJunio C Hamano <gitster@pobox.com>2011-10-23 21:49:14 -0700
commit10b2a48113b8ab6b8f48229eb40fc3637ce025ae (patch)
tree1ea8b46e0d7f16f91215922645ac7e4afe5557c7
parente454a83fa2640166aba77ef3fe2bfb81949895b8 (diff)
parentf7d958dff5e194797ef6776bcc77c1349f9f8c81 (diff)
downloadgit-10b2a48113b8ab6b8f48229eb40fc3637ce025ae.tar.gz
Merge branch 'maint'
* maint: Git 1.7.7.1 RelNotes/1.7.7.1: setgid bit patch is about fixing "git init" via Makefile setting Conflicts: GIT-VERSION-GEN
-rw-r--r--Documentation/RelNotes/1.7.7.1.txt5
-rw-r--r--Documentation/git.txt3
2 files changed, 5 insertions, 3 deletions
diff --git a/Documentation/RelNotes/1.7.7.1.txt b/Documentation/RelNotes/1.7.7.1.txt
index fecfac8a16..ac9b838e25 100644
--- a/Documentation/RelNotes/1.7.7.1.txt
+++ b/Documentation/RelNotes/1.7.7.1.txt
@@ -5,8 +5,9 @@ Fixes since v1.7.7
------------------
* On some BSD systems, adding +s bit on directories is detrimental
- (it is not necessary on BSD to begin with). The installation
- procedure has been updated to take this into account.
+ (it is not necessary on BSD to begin with). "git init --shared"
+ has been updated to take this into account without extra makefile
+ settings on platforms the Makefile knows about.
* After incorrectly written third-party tools store a tag object in
HEAD, git diagnosed it as a repository corruption and refused to
diff --git a/Documentation/git.txt b/Documentation/git.txt
index cbc51d5a94..5e80cfd71a 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -44,9 +44,10 @@ unreleased) version of git, that is available from 'master'
branch of the `git.git` repository.
Documentation for older releases are available here:
-* link:v1.7.7/git.html[documentation for release 1.7.7]
+* link:v1.7.7.1/git.html[documentation for release 1.7.7.1]
* release notes for
+ link:RelNotes/1.7.7.1.txt[1.7.7.1],
link:RelNotes/1.7.7.txt[1.7.7].
* link:v1.7.6.4/git.html[documentation for release 1.7.6.4]