From 7d575a5e95514414281eb8f7d33d12c1b396edd2 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 30 Apr 2008 08:45:27 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.5.1-114-g8d308 --- config.txt | 8 +++++++- git-config.html | 10 ++++++++-- git-fsck.html | 5 +++-- git-fsck.txt | 3 ++- git-prune.html | 25 ++++++++++++++++++++++++- git-prune.txt | 20 ++++++++++++++++++++ git-unpack-objects.html | 4 ++-- git-unpack-objects.txt | 2 +- git.html | 12 +++++++++--- git.txt | 10 ++++++++-- gitk.html | 12 +++++++++++- gitk.txt | 6 ++++++ 12 files changed, 101 insertions(+), 16 deletions(-) diff --git a/config.txt b/config.txt index 7a24f6e81..824e416e9 100644 --- a/config.txt +++ b/config.txt @@ -234,7 +234,13 @@ core.worktree:: used in combination with repositories found automatically in a .git directory (i.e. $GIT_DIR is not set). This can be overridden by the GIT_WORK_TREE environment - variable and the '--work-tree' command line option. + variable and the '--work-tree' command line option. It can be + a 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. core.logAllRefUpdates:: Enable the reflog. Updates to a ref is logged to the file diff --git a/git-config.html b/git-config.html index 78ca9551d..f8cf71a07 100644 --- a/git-config.html +++ b/git-config.html @@ -973,7 +973,13 @@ core.worktree used in combination with repositories found automatically in a .git directory (i.e. $GIT_DIR is not set). This can be overridden by the GIT_WORK_TREE environment - variable and the --work-tree command line option. + variable and the --work-tree command line option. It can be + a 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.

@@ -2422,7 +2428,7 @@ web.browser diff --git a/git-fsck.html b/git-fsck.html index 452e24184..16d803a7c 100644 --- a/git-fsck.html +++ b/git-fsck.html @@ -291,7 +291,8 @@ git-fsck(1) Manual Page An object to treat as the head of an unreachability trace.

If no objects are given, git-fsck defaults to using the -index file and all SHA1 references in .git/refs/* as heads.

+index file, all SHA1 references in .git/refs/*, and all reflogs (unless +--no-reflogs is given) as heads.

--unreachable @@ -521,7 +522,7 @@ GIT_ALTERNATE_OBJECT_DIRECTORIES diff --git a/git-fsck.txt b/git-fsck.txt index f16cb9861..4cc26fb74 100644 --- a/git-fsck.txt +++ b/git-fsck.txt @@ -22,7 +22,8 @@ OPTIONS An object to treat as the head of an unreachability trace. + If no objects are given, git-fsck defaults to using the -index file and all SHA1 references in .git/refs/* as heads. +index file, all SHA1 references in .git/refs/*, and all reflogs (unless +--no-reflogs is given) as heads. --unreachable:: Print out objects that exist but that aren't readable from any diff --git a/git-prune.html b/git-prune.html index 49b51b4c6..403d23cc2 100644 --- a/git-prune.html +++ b/git-prune.html @@ -276,6 +276,15 @@ git-prune(1) Manual Page

DESCRIPTION

+
+ + + +
+
Note
+		In most cases, users should run git-gc(1), which calls +git-prune. See the section "NOTES", below.
+

This runs git-fsck --unreachable using all the refs available in $GIT_DIR/refs, optionally with additional set of objects specified on the command line, and prunes all @@ -334,6 +343,20 @@ borrows from your repository via its 

$ git prune $(cd ../another && $(git-rev-parse --all))
+

Notes

+
+

In most cases, users will not need to call git-prune directly, but +should instead call git-gc(1), which handles pruning along with +many other housekeeping tasks.

+

For a description of which objects are considered for pruning, see +git-fsck's --unreachable option.

+
+

See Also

+
+

git-fsck(1), +git-gc(1), +git-reflog(1)

+

Author

Written by Linus Torvalds <torvalds@osdl.org>

@@ -348,7 +371,7 @@ borrows from your repository via its
diff --git a/git-prune.txt b/git-prune.txt index f151cff5d..f92bb8cfa 100644 --- a/git-prune.txt +++ b/git-prune.txt @@ -13,6 +13,9 @@ SYNOPSIS DESCRIPTION ----------- +NOTE: In most cases, users should run linkgit:git-gc[1], which calls +git-prune. See the section "NOTES", below. + This runs `git-fsck --unreachable` using all the refs available in `$GIT_DIR/refs`, optionally with additional set of objects specified on the command line, and prunes all @@ -50,6 +53,23 @@ borrows from your repository via its $ git prune $(cd ../another && $(git-rev-parse --all)) ------------ +Notes +----- + +In most cases, users will not need to call git-prune directly, but +should instead call linkgit:git-gc[1], which handles pruning along with +many other housekeeping tasks. + +For a description of which objects are considered for pruning, see +git-fsck's --unreachable option. + +See Also +-------- + +linkgit:git-fsck[1], +linkgit:git-gc[1], +linkgit:git-reflog[1] + Author ------ Written by Linus Torvalds diff --git a/git-unpack-objects.html b/git-unpack-objects.html index 2cdd7f8d8..a4f691ac3 100644 --- a/git-unpack-objects.html +++ b/git-unpack-objects.html @@ -272,7 +272,7 @@ git-unpack-objects(1) Manual Page

SYNOPSIS

-

git-unpack-objects [-n] [-q] [-r] <pack-file

+

git-unpack-objects [-n] [-q] [-r] [--strict] <pack-file

DESCRIPTION

@@ -341,7 +341,7 @@ new packs and replace existing ones.

diff --git a/git-unpack-objects.txt b/git-unpack-objects.txt index 3697896a0..50947c50d 100644 --- a/git-unpack-objects.txt +++ b/git-unpack-objects.txt @@ -8,7 +8,7 @@ git-unpack-objects - Unpack objects from a packed archive SYNOPSIS -------- -'git-unpack-objects' [-n] [-q] [-r] .

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.

@@ -367,7 +368,12 @@ help ….

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.

@@ -1946,7 +1952,7 @@ contributors on the git-list <git@vger.kernel.org>.

diff --git a/git.txt b/git.txt index a070e078e..6f445b1e3 100644 --- a/git.txt +++ b/git.txt @@ -143,7 +143,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 @@ -151,7 +152,12 @@ help ...'. 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 diff --git a/gitk.html b/gitk.html index 9e7b724d0..de583ce38 100644 --- a/gitk.html +++ b/gitk.html @@ -322,6 +322,16 @@ frequently used options.

+--merge +
+
+

+ After an attempt to merge stops with conflicts, show the commits on + the history between two branches (i.e. the HEAD and the MERGE_HEAD) + that modify the conflicted files. +

+
+
<revs>
@@ -430,7 +440,7 @@ such as display options, font, and colors.

diff --git a/gitk.txt b/gitk.txt index ed3ba83c5..50d12da89 100644 --- a/gitk.txt +++ b/gitk.txt @@ -41,6 +41,12 @@ frequently used options. Show all branches. +--merge:: + + After an attempt to merge stops with conflicts, show the commits on + the history between two branches (i.e. the HEAD and the MERGE_HEAD) + that modify the conflicted files. + :: Limit the revisions to show. This can be either a single revision -- 2.26.2