From 3eb513f72a4d78c8b588c8ee957826c86c842a96 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 18 Sep 2006 02:47:16 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.4.2.1-g80823 --- config.txt | 14 ++++++++++++++ git-apply.html | 16 +++++++++++++++- git-apply.txt | 10 ++++++++++ git-pack-objects.html | 40 +++++++++++++++++++++++++++++++++++++--- git-pack-objects.txt | 21 ++++++++++++++++++++- git-repack.html | 18 ++++++++++++++++-- git-repack.txt | 12 +++++++++++- git-repo-config.html | 26 +++++++++++++++++++++++++- 8 files changed, 148 insertions(+), 9 deletions(-) diff --git a/config.txt b/config.txt index ce722a2db..844cae4cf 100644 --- a/config.txt +++ b/config.txt @@ -225,6 +225,20 @@ showbranch.default:: The default set of branches for gitlink:git-show-branch[1]. See gitlink:git-show-branch[1]. +status.color:: + A boolean to enable/disable color in the output of + gitlink:git-status[1]. May be set to `true` (or `always`), + `false` (or `never`) or `auto`, in which case colors are used + only when the output is to a terminal. Defaults to false. + +status.color.:: + Use customized color for status colorization. `` is + one of `header` (the header text of the status message), + `updated` (files which are updated but not committed), + `changed` (files which are changed but not updated in the index), + or `untracked` (files which are not tracked by git). The values of + these variables may be specified as in diff.color.. + tar.umask:: By default, gitlink:git-tar-tree[1] sets file and directories modes to 0666 or 0777. While this is both useful and acceptable for projects diff --git a/git-apply.html b/git-apply.html index 84af247e5..1fe07027b 100644 --- a/git-apply.html +++ b/git-apply.html @@ -426,6 +426,20 @@ and a work tree.

+--unidiff-zero +
+
+

+ By default, git-apply(1) expects that the patch being + applied is a unified diff with at least one line of context. + This provides good safety measures, but breaks down when + applying a diff generated with --unified=0. To bypass these + checks use --unidiff-zero. +

+

Note, for the reasons stated above usage of context-free patches are +discouraged.

+
+
--apply
@@ -568,7 +582,7 @@ apply.whitespace diff --git a/git-apply.txt b/git-apply.txt index 0a6f7b321..d9137c748 100644 --- a/git-apply.txt +++ b/git-apply.txt @@ -95,6 +95,16 @@ OPTIONS context exist they all must match. By default no context is ever ignored. +--unidiff-zero:: + By default, gitlink:git-apply[1] expects that the patch being + applied is a unified diff with at least one line of context. + This provides good safety measures, but breaks down when + applying a diff generated with --unified=0. To bypass these + checks use '--unidiff-zero'. ++ +Note, for the reasons stated above usage of context-free patches are +discouraged. + --apply:: If you use any of the options marked "Turns off 'apply'" above, gitlink:git-apply[1] reads and outputs the diff --git a/git-pack-objects.html b/git-pack-objects.html index 3b2ab4280..b0d8a1611 100644 --- a/git-pack-objects.html +++ b/git-pack-objects.html @@ -275,7 +275,7 @@ git-pack-objects(1) Manual Page
git-pack-objects [-q] [--no-reuse-delta] [--non-empty] [--local] [--incremental] [--window=N] [--depth=N] - {--stdout | base-name} < object-list
+ [--revs [--unpacked | --all]*] [--stdout | base-name] < object-list

DESCRIPTION

@@ -326,6 +326,39 @@ base-name

+--revs +
+
+

+ Read the revision arguments from the standard input, instead of + individual object names. The revision arguments are processed + the same way as git-rev-list(1) with --objects flag + uses its commit arguments to build the list of objects it + outputs. The objects on the resulting list are packed. +

+
+
+--unpacked +
+
+

+ This implies --revs. When processing the list of + revision arguments read from the standard input, limit + the objects packed to those that are not already packed. +

+
+
+--all +
+
+

+ This implies --revs. In addition to the list of + revision arguments read from the standard input, pretend + as if all refs under $GIT_DIR/refs are specifed to be + included. +

+
+
--window and --depth
@@ -403,7 +436,8 @@ base-name

See Also

-

git-repack(1) +

git-rev-list(1) +git-repack(1) git-prune-packed(1)

GIT

@@ -412,7 +446,7 @@ base-name diff --git a/git-pack-objects.txt b/git-pack-objects.txt index 4991f88c9..d4661ddc2 100644 --- a/git-pack-objects.txt +++ b/git-pack-objects.txt @@ -11,7 +11,7 @@ SYNOPSIS [verse] 'git-pack-objects' [-q] [--no-reuse-delta] [--non-empty] [--local] [--incremental] [--window=N] [--depth=N] - {--stdout | base-name} < object-list + [--revs [--unpacked | --all]*] [--stdout | base-name] < object-list DESCRIPTION @@ -56,6 +56,24 @@ base-name:: Write the pack contents (what would have been written to .pack file) out to the standard output. +--revs:: + Read the revision arguments from the standard input, instead of + individual object names. The revision arguments are processed + the same way as gitlink:git-rev-list[1] with `--objects` flag + uses its `commit` arguments to build the list of objects it + outputs. The objects on the resulting list are packed. + +--unpacked:: + This implies `--revs`. When processing the list of + revision arguments read from the standard input, limit + the objects packed to those that are not already packed. + +--all:: + This implies `--revs`. In addition to the list of + revision arguments read from the standard input, pretend + as if all refs under `$GIT_DIR/refs` are specifed to be + included. + --window and --depth:: These two options affects how the objects contained in the pack are stored using delta compression. The @@ -103,6 +121,7 @@ Documentation by Junio C Hamano See Also -------- +gitlink:git-rev-list[1] gitlink:git-repack[1] gitlink:git-prune-packed[1] diff --git a/git-repack.html b/git-repack.html index 7b66f7f2a..1e760fa23 100644 --- a/git-repack.html +++ b/git-repack.html @@ -272,7 +272,7 @@ git-repack(1) Manual Page

SYNOPSIS

-

git-repack [-a] [-d] [-f] [-l] [-n] [-q]

+

git-repack [-a] [-d] [-f] [-l] [-n] [-q] [--window=N] [--depth=N]

DESCRIPTION

@@ -346,6 +346,20 @@ engines, disk storage, etc.

git update-server-info.

+
+--window=[N], --depth=[N] +
+
+

+ These two options affects how the objects contained in the pack are + stored using delta compression. The objects are first internally + sorted by type, size and optionally names and compared against the + other objects within --window to see if using delta compression saves + space. --depth limits the maximum delta depth; making it too deep + affects the performance on the unpacker side, because delta data needs + to be applied that many times to get to the necessary object. +

+

Author

@@ -367,7 +381,7 @@ engines, disk storage, etc.

diff --git a/git-repack.txt b/git-repack.txt index 951622774..49f7e0a4a 100644 --- a/git-repack.txt +++ b/git-repack.txt @@ -9,7 +9,7 @@ objects into pack files. SYNOPSIS -------- -'git-repack' [-a] [-d] [-f] [-l] [-n] [-q] +'git-repack' [-a] [-d] [-f] [-l] [-n] [-q] [--window=N] [--depth=N] DESCRIPTION ----------- @@ -56,6 +56,16 @@ OPTIONS Do not update the server information with `git update-server-info`. +--window=[N], --depth=[N]:: + These two options affects how the objects contained in the pack are + stored using delta compression. The objects are first internally + sorted by type, size and optionally names and compared against the + other objects within `--window` to see if using delta compression saves + space. `--depth` limits the maximum delta depth; making it too deep + affects the performance on the unpacker side, because delta data needs + to be applied that many times to get to the necessary object. + + Author ------ Written by Linus Torvalds diff --git a/git-repo-config.html b/git-repo-config.html index 798611aaa..395f511d3 100644 --- a/git-repo-config.html +++ b/git-repo-config.html @@ -903,6 +903,30 @@ showbranch.default

+status.color +
+
+

+ A boolean to enable/disable color in the output of + git-status(1). May be set to true (or always), + false (or never) or auto, in which case colors are used + only when the output is to a terminal. Defaults to false. +

+
+
+status.color.<slot> +
+
+

+ Use customized color for status colorization. <slot> is + one of header (the header text of the status message), + updated (files which are updated but not committed), + changed (files which are changed but not updated in the index), + or untracked (files which are not tracked by git). The values of + these variables may be specified as in diff.color.<slot>. +

+
+
tar.umask
@@ -972,7 +996,7 @@ imap -- 2.26.2