Sync with 1.6.2.4

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

4 files changed, 25 insertions, 16 deletions

diff --git a/Documentation/RelNotes-1.6.2.4.txt b/Documentation/RelNotes-1.6.2.4.txt
index 21bf4f3a3d..f4bf1d0986 100644
--- a/Documentation/RelNotes-1.6.2.4.txt
+++ b/Documentation/RelNotes-1.6.2.4.txt
@@ -7,9 +7,17 @@ Fixes since v1.6.2.3
 * The configuration parser had a buffer overflow while parsing an overlong
   value.
 
+* pruning reflog entries that are unreachable from the tip of the ref
+  during "git reflog prune" (hence "git gc") was very inefficient.
+
+* "git-add -p" lacked a way to say "q"uit to refuse staging any hunks for
+  the remaining paths.  You had to say "d" and then ^C.
+
 * "git-checkout <tree-ish> <submodule>" did not update the index entry at
   the named path; it now does.
 
+* "git-fast-export" choked when seeing a tag that does not point at commit.
+
 * "git init" segfaulted when given an overlong template location via
   the --template= option.
 
@@ -27,5 +35,5 @@ Many small documentation updates are included as well.
 ---
 exec >/var/tmp/1
 echo O=$(git describe maint)
-O=v1.6.2.3-21-ga51609a
+O=v1.6.2.3-38-g318b847
 git shortlog --no-merges $O..maint
diff --git a/Documentation/RelNotes-1.6.3.txt b/Documentation/RelNotes-1.6.3.txt
index ca38decb37..b53e7b86e7 100644
--- a/Documentation/RelNotes-1.6.3.txt
+++ b/Documentation/RelNotes-1.6.3.txt
@@ -42,9 +42,6 @@ Updates since v1.6.2
 * many uses of lstat(2) in the codepath for "git checkout" have been
   optimized out.
 
-* pruning reflog entries that are unreachable from the tip of the ref
-  during "git reflog prune" (hence "git gc") was very inefficient.
-
 (usability, bells and whistles)
 
 * Boolean configuration variable yes/no can be written as on/off.
@@ -80,8 +77,6 @@ Updates since v1.6.2
   1.6.2, but the initial implementation did not teach this to a few
   commands.  Now the syntax works with "branch -m @{-1} newname".
 
-* "git-add -p" now supports "q"uit action.
-
 * git-archive learned --output=<file> option.
 
 * git-archive takes attributes from the tree being archived; strictly
@@ -109,8 +104,6 @@ Updates since v1.6.2
 * git-difftool is now part of the officially supported command, primarily
   maintained by David Aguilar.
 
-* git-fast-export choked when seeing a tag that does not point at commit.
-
 * git-for-each-ref learned a new "upstream" token.
 
 * git-format-patch can be told to use attachment with a new configuration,
@@ -184,6 +177,6 @@ v1.6.2.X series.
 
 ---
 exec >/var/tmp/1
-O=v1.6.3-rc0-74-g9824a38
+O=v1.6.3-rc1-1-gea10b60
 echo O=$(git describe master)
 git shortlog --no-merges $O..master ^maint
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 5ffd14141a..35056e1a9c 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -295,8 +295,10 @@ core.sharedRepository::
 	group-shareable. When 'umask' (or 'false'), git will use permissions
 	reported by umask(2). When '0xxx', where '0xxx' is an octal number,
 	files in the repository will have this mode value. '0xxx' will override
-	user's umask value, and thus, users with a safe umask (0077) can use
-	this option. Examples: '0660' is equivalent to 'group'. '0640' is a
+	user's umask value (whereas the other options will only override
+	requested parts of the user's umask value). Examples: '0660' will make
+	the repo read/write-able for the owner and group, but inaccessible to
+	others (equivalent to 'group' unless umask is e.g. '0022'). '0640' is a
 	repository that is group-readable but not group-writable.
 	See linkgit:git-init[1]. False by default.
 
diff --git a/Documentation/git-init.txt b/Documentation/git-init.txt
index 71749c09d3..7151d12f34 100644
--- a/Documentation/git-init.txt
+++ b/Documentation/git-init.txt
@@ -54,15 +54,21 @@ is given:
 
  - 'group' (or 'true'): Make the repository group-writable, (and g+sx, since
    the git group may be not the primary group of all users).
+   This is used to loosen the permissions of an otherwise safe umask(2) value.
+   Note that the umask still applies to the other permission bits (e.g. if
+   umask is '0022', using 'group' will not remove read privileges from other
+   (non-group) users). See '0xxx' for how to exactly specify the repository
+   permissions.
 
  - 'all' (or 'world' or 'everybody'): Same as 'group', but make the repository
    readable by all users.
 
- - '0xxx': '0xxx' is an octal number and each file will have mode '0xxx'
-   Any option except 'umask' can be set using this option. '0xxx' will
-   override users umask(2) value, and thus, users with a safe umask (0077)
-   can use this option. '0640' will create a repository which is group-readable
-   but not writable. '0660' is equivalent to 'group'.
+ - '0xxx': '0xxx' is an octal number and each file will have mode '0xxx'.
+   '0xxx' will override users' umask(2) value (and not only loosen permissions
+   as 'group' and 'all' does). '0640' will create a repository which is
+   group-readable, but not group-writable or accessible to others. '0660' will
+   create a repo that is readable and writable to the current user and group,
+   but inaccessible to others.
 
 By default, the configuration flag receive.denyNonFastForwards is enabled
 in shared repositories, so that you cannot force a non fast-forwarding push