From: Junio C Hamano Date: Sat, 7 Jun 2008 20:01:14 +0000 (-0700) Subject: Merge 1.5.5.4 in X-Git-Tag: v1.5.6-rc2~1 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/dceab837557077f70bf082727645925aec443500?ds=inline;hp=-c Merge 1.5.5.4 in Signed-off-by: Junio C Hamano --- dceab837557077f70bf082727645925aec443500 diff --combined Documentation/git.txt index ba07e51f59,615c307cbc..cf67110a91 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@@ -1,4 -1,4 +1,4 @@@ -git(7) +git(1) ====== NAME @@@ -20,10 -20,10 +20,10 @@@ Git is a fast, scalable, distributed re unusually rich command set that provides both high-level operations and full access to internals. -See this link:tutorial.html[tutorial] to get started, then see +See this linkgit:gittutorial[7][tutorial] to get started, then see link:everyday.html[Everyday Git] for a useful minimum set of commands, and "man git-commandname" for documentation of each command. CVS users may -also want to read link:cvs-migration.html[CVS migration]. See +also want to read linkgit:gitcvs-migration[7][CVS migration]. See link:user-manual.html[Git User's Manual] for a more in-depth introduction. @@@ -46,12 -46,13 +46,13 @@@ Documentation for older releases are av * link:v1.5.5/git.html[documentation for release 1.5.5] * release notes for + link:RelNotes-1.5.5.4.txt[1.5.5.4], link:RelNotes-1.5.5.3.txt[1.5.5.3], link:RelNotes-1.5.5.2.txt[1.5.5.2], link:RelNotes-1.5.5.1.txt[1.5.5.1], link:RelNotes-1.5.5.txt[1.5.5]. - * link:v1.5.5.3/git.html[documentation for release 1.5.5.3] + * link:v1.5.5.4/git.html[documentation for release 1.5.5.4] * link:v1.5.4.5/git.html[documentation for release 1.5.4.5] @@@ -145,8 -146,7 +146,8 @@@ help ...' --git-dir=:: Set the path to the repository. This can also be controlled by - setting the GIT_DIR environment variable. + setting the GIT_DIR environment variable. It can be an absolute + path or relative path to current working directory. --work-tree=:: Set the path to the working tree. The value will not be @@@ -154,12 -154,7 +155,12 @@@ a .git directory (i.e. $GIT_DIR is not set). This can also be controlled by setting the GIT_WORK_TREE environment variable and the core.worktree configuration - variable. + variable. It can be an absolute path or relative path to + the directory specified by --git-dir or GIT_DIR. + Note: If --git-dir or GIT_DIR are specified but none of + --work-tree, GIT_WORK_TREE and core.worktree is specified, + the current working directory is regarded as the top directory + of your working tree. --bare:: Treat the repository as a bare repository. If GIT_DIR @@@ -174,7 -169,7 +175,7 @@@ See the references above to get starte probably more detail than necessary for a first-time user. The link:user-manual.html#git-concepts[git concepts chapter of the -user-manual] and the link:core-tutorial.html[Core tutorial] both provide +user-manual] and the linkgit:gitcore-tutorial[7][Core tutorial] both provide introductions to the underlying git architecture. See also the link:howto-index.html[howto] documents for some useful @@@ -364,10 -359,9 +365,10 @@@ For a more complete list of ways to spe File/Directory Structure ------------------------ -Please see the link:repository-layout.html[repository layout] document. +Please see the linkgit:gitrepository-layout[5][repository layout] +document. -Read link:hooks.html[hooks] for more details about each hook. +Read linkgit:githooks[5][hooks] for more details about each hook. Higher level SCMs may provide and manage additional information in the `$GIT_DIR`. @@@ -375,7 -369,7 +376,7 @@@ Terminology ----------- -Please see the link:glossary.html[glossary] document. +Please see the linkgit:gitglossary[7][glossary] document. Environment Variables @@@ -519,7 -513,7 +520,7 @@@ Discussion[[Discussion] More detail on the following is available from the link:user-manual.html#git-concepts[git concepts chapter of the -user-manual] and the link:core-tutorial.html[Core tutorial]. +user-manual] and the linkgit:gitcore-tutorial[7][Core tutorial]. A git project normally consists of a working directory with a ".git" subdirectory at the top level. The .git directory contains, among other @@@ -580,13 -574,6 +581,13 @@@ The documentation for git suite was sta , and later enhanced greatly by the contributors on the git-list . +SEE ALSO +-------- +linkgit:gittutorial[7], linkgit:gittutorial-2[7], +linkgit:giteveryday[7], linkgit:gitcvs-migration[7], +linkgit:gitglossary[7], linkgit:gitcore-tutorial[7], +link:user-manual.html[The Git User's Manual] + GIT --- -Part of the linkgit:git[7] suite +Part of the linkgit:git[1] suite