From cae8627f672d77bd3e7a2edf5afa22aa3e5821ce Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 21 Aug 2007 02:20:49 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.3-rc5-46-g23d5 --- config.txt | 2 +- git-checkout.html | 4 ++-- git-checkout.txt | 2 +- git-config.html | 4 ++-- git-log.html | 3 ++- git-log.txt | 1 + git-rev-list.html | 6 ++++-- git-rev-list.txt | 3 +++ git-rev-parse.html | 7 +++++-- git-rev-parse.txt | 5 ++++- git-send-email.html | 4 ++-- git-send-email.txt | 2 +- git.html | 13 +++++++++++-- git.txt | 6 +++++- 14 files changed, 44 insertions(+), 18 deletions(-) diff --git a/config.txt b/config.txt index de9e72b56..46f40ad4c 100644 --- a/config.txt +++ b/config.txt @@ -192,7 +192,7 @@ core.worktree:: variable and the '--work-tree' command line option. core.logAllRefUpdates:: - Updates to a ref is logged to the file + Enable the reflog. Updates to a ref is logged to the file "$GIT_DIR/logs/", by appending the new and old SHA1, the date/time and the reason of the update, but only when the file exists. If this configuration diff --git a/git-checkout.html b/git-checkout.html index 928220f77..9a3729b47 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -302,7 +302,7 @@ working tree.

- Quiet, supress feedback messages. + Quiet, suppress feedback messages.

@@ -538,7 +538,7 @@ $ git add frotz diff --git a/git-checkout.txt b/git-checkout.txt index 818b720b9..734928bf9 100644 --- a/git-checkout.txt +++ b/git-checkout.txt @@ -35,7 +35,7 @@ working tree. OPTIONS ------- -q:: - Quiet, supress feedback messages. + Quiet, suppress feedback messages. -f:: Proceed even if the index or the working tree differs diff --git a/git-config.html b/git-config.html index 6cd648711..2c95d21de 100644 --- a/git-config.html +++ b/git-config.html @@ -895,7 +895,7 @@ core.logAllRefUpdates

- Updates to a ref <ref> is logged to the file + Enable the reflog. Updates to a ref <ref> is logged to the file "$GIT_DIR/logs/<ref>", by appending the new and old SHA1, the date/time and the reason of the update, but only when the file exists. If this configuration @@ -1883,7 +1883,7 @@ transfer.unpackLimit

diff --git a/git-log.html b/git-log.html index 3bce1def0..9b49154ba 100644 --- a/git-log.html +++ b/git-log.html @@ -368,6 +368,7 @@ people using 80-column terminals.

Show commits as they were recorded in the reflog. The log contains a record about how the tip of a reference was changed. + Cannot be combined with --reverse. See also git-reflog(1).

@@ -852,7 +853,7 @@ reversible operation.

diff --git a/git-log.txt b/git-log.txt index 5a90f65b5..1e6dbd93b 100644 --- a/git-log.txt +++ b/git-log.txt @@ -49,6 +49,7 @@ include::pretty-options.txt[] -g, \--walk-reflogs:: Show commits as they were recorded in the reflog. The log contains a record about how the tip of a reference was changed. + Cannot be combined with --reverse. See also gitlink:git-reflog[1]. --decorate:: diff --git a/git-rev-list.html b/git-rev-list.html index e8c44d138..cef5df943 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -679,7 +679,8 @@ this causes the output to have two extra lines of information taken from the reflog. By default, commit@{Nth} notation is used in the output. When the starting commit is specified as instead. Under --pretty=oneline, the commit message is -prefixed with this information on the same line. +prefixed with this information on the same line.
+Cannot be combined with --reverse.

@@ -781,6 +782,7 @@ we are bisecting right now to bisect_all.

Output the commits in reverse order. + Cannot be combined with --walk-reflogs.

@@ -1142,7 +1144,7 @@ and the git-list <git@vger.kernel.org>.

diff --git a/git-rev-list.txt b/git-rev-list.txt index 1c1978140..cbbc23454 100644 --- a/git-rev-list.txt +++ b/git-rev-list.txt @@ -298,6 +298,8 @@ used in the output. When the starting commit is specified as 'commit@{now}', output also uses 'commit@\{timestamp}' notation instead. Under '\--pretty=oneline', the commit message is prefixed with this information on the same line. ++ +Cannot be combined with --reverse. --merge:: @@ -373,6 +375,7 @@ By default, the commits are shown in reverse chronological order. --reverse:: Output the commits in reverse order. + Cannot be combined with --walk-reflogs. Object Traversal ~~~~~~~~~~~~~~~~ diff --git a/git-rev-parse.html b/git-rev-parse.html index 6f45c66d6..72c4d4b60 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html @@ -650,7 +650,10 @@ A suffix : followed by a path; this names the blob or tree A colon, optionally followed by a stage number (0 to 3) and a colon, followed by a path; this names a blob object in the index at the given path. Missing stage number (and the colon - that follows it) names an stage 0 entry. + that follows it) names an stage 0 entry. During a merge, stage + 1 is the common ancestor, stage 2 is the target branch's version + (typically the current branch), and stage 3 is the version from + the branch being merged.

@@ -735,7 +738,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-rev-parse.txt b/git-rev-parse.txt index 4b4d229e6..4758c33de 100644 --- a/git-rev-parse.txt +++ b/git-rev-parse.txt @@ -215,7 +215,10 @@ blobs contained in a commit. * A colon, optionally followed by a stage number (0 to 3) and a colon, followed by a path; this names a blob object in the index at the given path. Missing stage number (and the colon - that follows it) names an stage 0 entry. + that follows it) names an stage 0 entry. During a merge, stage + 1 is the common ancestor, stage 2 is the target branch's version + (typically the current branch), and stage 3 is the version from + the branch being merged. Here is an illustration, by Jon Loeliger. Both node B and C are a commit parents of commit node A. Parent commits are ordered diff --git a/git-send-email.html b/git-send-email.html index b49701804..21e09fdfc 100644 --- a/git-send-email.html +++ b/git-send-email.html @@ -401,7 +401,7 @@ enabled interface to provide the necessary information.

If this is set, do not add the From: address to the cc: list, if it shows up in a From: line. Default is the value of sendemail.suppressfrom configuration value; - if that is unspecified, default to --no-supress-from. + if that is unspecified, default to --no-suppress-from.

@@ -512,7 +512,7 @@ send_lots_of_email.pl by Greg Kroah-Hartman.

diff --git a/git-send-email.txt b/git-send-email.txt index 08a023ea9..8231286e0 100644 --- a/git-send-email.txt +++ b/git-send-email.txt @@ -88,7 +88,7 @@ The --cc option must be repeated for each user you want on the cc list. If this is set, do not add the From: address to the cc: list, if it shows up in a From: line. Default is the value of 'sendemail.suppressfrom' configuration value; - if that is unspecified, default to --no-supress-from. + if that is unspecified, default to --no-suppress-from. --thread, --no-thread:: If this is set, the In-Reply-To header will be set on each email sent. diff --git a/git.html b/git.html index 421eae775..ee4f45d2b 100644 --- a/git.html +++ b/git.html @@ -273,7 +273,8 @@ git(7) Manual Page

SYNOPSIS

-
git [--version] [--exec-path[=GIT_EXEC_PATH]] [-p|--paginate] +
git [--version] [--exec-path[=GIT_EXEC_PATH]] + [-p|--paginate|--no-pager] [--bare] [--git-dir=GIT_DIR] [--work-tree=GIT_WORK_TREE] [--help] COMMAND [ARGS]
@@ -336,6 +337,14 @@ documentation can be viewed at

+--no-pager +
+
+

+ Do not pipe git output into a pager. +

+
+
--git-dir=<path>
@@ -2429,7 +2438,7 @@ contributors on the git-list <git@vger.kernel.org>.

diff --git a/git.txt b/git.txt index 8017997fb..3b0d53025 100644 --- a/git.txt +++ b/git.txt @@ -9,7 +9,8 @@ git - the stupid content tracker SYNOPSIS -------- [verse] -'git' [--version] [--exec-path[=GIT_EXEC_PATH]] [-p|--paginate] +'git' [--version] [--exec-path[=GIT_EXEC_PATH]] + [-p|--paginate|--no-pager] [--bare] [--git-dir=GIT_DIR] [--work-tree=GIT_WORK_TREE] [--help] COMMAND [ARGS] @@ -103,6 +104,9 @@ OPTIONS -p|--paginate:: Pipe all output into 'less' (or if set, $PAGER). +--no-pager:: + Do not pipe git output into a pager. + --git-dir=:: Set the path to the repository. This can also be controlled by setting the GIT_DIR environment variable. -- 2.26.2