diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-07-02 00:10:42 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-02 00:10:42 +0400 |
| commit | 0305b636542c8c137ed7c82fee90db8d3621118c (patch) | |
| tree | 3a2a5e7a2b814b2f96c5edd681768706b9b3a048 /Documentation/git.txt | |
| parent | cd5ada993d6a992eaed1c416f9a2ed6ba9c4cb6d (diff) | |
| parent | 9489d0f197185d584294aa99a09a1b3c5ebb25e0 (diff) | |
Merge branch 'ei/worktree+filter'
* ei/worktree+filter:
filter-branch: always export GIT_DIR if it is set
setup_git_directory: fix segfault if repository is found in cwd
test GIT_WORK_TREE
extend rev-parse test for --is-inside-work-tree
Use new semantics of is_bare/inside_git_dir/inside_work_tree
introduce GIT_WORK_TREE to specify the work tree
test git rev-parse
rev-parse: introduce --is-bare-repository
rev-parse: document --is-inside-git-dir
Diffstat (limited to 'Documentation/git.txt')
| -rw-r--r-- | Documentation/git.txt | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt index 826914837b..2cc0b214d2 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -10,7 +10,8 @@ SYNOPSIS -------- [verse] 'git' [--version] [--exec-path[=GIT_EXEC_PATH]] [-p|--paginate] - [--bare] [--git-dir=GIT_DIR] [--help] COMMAND [ARGS] + [--bare] [--git-dir=GIT_DIR] [--work-tree=GIT_WORK_TREE] + [--help] COMMAND [ARGS] DESCRIPTION ----------- @@ -103,6 +104,14 @@ OPTIONS Set the path to the repository. This can also be controlled by setting the GIT_DIR environment variable. +--work-tree=<path>:: + Set the path to the working tree. The value will not be + used in combination with repositories found automatically in + 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. + --bare:: Same as --git-dir=`pwd`. @@ -347,6 +356,13 @@ git so take care if using Cogito etc. specifies a path to use instead of the default `.git` for the base of the repository. +'GIT_WORK_TREE':: + Set the path to the working tree. The value will not be + used in combination with repositories found automatically in + a .git directory (i.e. $GIT_DIR is not set). + This can also be controlled by the '--work-tree' command line + option and the core.worktree configuration variable. + git Commits ~~~~~~~~~~~ 'GIT_AUTHOR_NAME':: |