From: Junio C Hamano Date: Fri, 23 Sep 2011 22:31:08 +0000 (-0700) Subject: Merge 1.7.6.4 in X-Git-Tag: v1.7.7-rc3~1 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b7619006ebd9c9760b34bb38e04ce4dc8c606483?ds=inline;hp=-c Merge 1.7.6.4 in Signed-off-by: Junio C Hamano --- b7619006ebd9c9760b34bb38e04ce4dc8c606483 diff --combined Documentation/git.txt index 4ae21a3cc7,d1481354a8..77376dea95 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@@ -10,8 -10,8 +10,8 @@@ SYNOPSI -------- [verse] 'git' [--version] [--exec-path[=]] [--html-path] [--man-path] [--info-path] - [-p|--paginate|--no-pager] [--no-replace-objects] - [--bare] [--git-dir=] [--work-tree=] + [-p|--paginate|--no-pager] [--no-replace-objects] [--bare] + [--git-dir=] [--work-tree=] [--namespace=] [-c =] [--help] [] @@@ -44,9 -44,10 +44,10 @@@ unreleased) version of git, that is ava branch of the `git.git` repository. Documentation for older releases are available here: - * link:v1.7.6.3/git.html[documentation for release 1.7.6.3] + * link:v1.7.6.4/git.html[documentation for release 1.7.6.4] * release notes for + link:RelNotes/1.7.6.4.txt[1.7.6.4], link:RelNotes/1.7.6.3.txt[1.7.6.3], link:RelNotes/1.7.6.2.txt[1.7.6.2], link:RelNotes/1.7.6.1.txt[1.7.6.1], @@@ -333,11 -334,6 +334,11 @@@ help ...` variable (see core.worktree in linkgit:git-config[1] for a more detailed discussion). +--namespace=:: + Set the git namespace. See linkgit:gitnamespaces[7] for more + details. Equivalent to setting the `GIT_NAMESPACE` environment + variable. + --bare:: Treat the repository as a bare repository. If GIT_DIR environment is not set, it is set to the current working @@@ -601,10 -597,6 +602,10 @@@ git so take care if using Cogito etc This can also be controlled by the '--work-tree' command line option and the core.worktree configuration variable. +'GIT_NAMESPACE':: + Set the git namespace; see linkgit:gitnamespaces[7] for details. + The '--namespace' command-line option also sets this value. + 'GIT_CEILING_DIRECTORIES':: This should be a colon-separated list of absolute paths. If set, it is a list of directories that git should not chdir