From: Junio C Hamano Date: Tue, 21 Aug 2007 02:20:52 +0000 (+0000) Subject: Autogenerated manpages for v1.5.3-rc5-46-g23d5 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f57c75c16c086b67ea8af0fe830338602f883e8e;p=git.git Autogenerated manpages for v1.5.3-rc5-46-g23d5 --- diff --git a/man1/git-checkout.1 b/man1/git-checkout.1 index e20534d58..6f3032339 100644 --- a/man1/git-checkout.1 +++ b/man1/git-checkout.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-CHECKOUT" "1" "07/19/2007" "Git 1.5.3.rc2.19.gc4fba" "Git Manual" +.TH "GIT\-CHECKOUT" "1" "08/21/2007" "Git 1.5.3.rc5.46.g23d5" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -22,7 +22,7 @@ When are given, this command does \fBnot\fR switch branches. It updates .SH "OPTIONS" .TP \-q -Quiet, supress feedback messages. +Quiet, suppress feedback messages. .TP \-f Proceed even if the index or the working tree differs from HEAD. This is used to throw away local changes. diff --git a/man1/git-config.1 b/man1/git-config.1 index af66278ab..12c94e5b2 100644 --- a/man1/git-config.1 +++ b/man1/git-config.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-CONFIG" "1" "08/04/2007" "Git 1.5.3.rc4" "Git Manual" +.TH "GIT\-CONFIG" "1" "08/21/2007" "Git 1.5.3.rc5.46.g23d5" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -364,7 +364,7 @@ core.worktree 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 be overriden by the GIT_WORK_TREE environment variable and the \fI\-\-work\-tree\fR command line option. .TP core.logAllRefUpdates -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 variable is set to true, missing "$GIT_DIR/logs/" file is automatically created for branch heads. +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 variable is set to true, missing "$GIT_DIR/logs/" file is automatically created for branch heads. This information can be used to determine what commit was the tip of a branch "2 days ago". diff --git a/man1/git-log.1 b/man1/git-log.1 index 257dc5a2a..0b5f05011 100644 --- a/man1/git-log.1 +++ b/man1/git-log.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-LOG" "1" "08/14/2007" "Git 1.5.3.rc4.91.g9fa34" "Git Manual" +.TH "GIT\-LOG" "1" "08/21/2007" "Git 1.5.3.rc5.46.g23d5" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -43,7 +43,7 @@ Follow only the first parent commit upon seeing a merge commit. This option give Show the change the commit introduces in a patch form. .TP \-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. See also \fBgit\-reflog\fR(1). +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 \fBgit\-reflog\fR(1). .TP \-\-decorate Print out the ref names of any commits that are shown. diff --git a/man1/git-rev-list.1 b/man1/git-rev-list.1 index 285a4b6cd..2606576f1 100644 --- a/man1/git-rev-list.1 +++ b/man1/git-rev-list.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-REV\-LIST" "1" "07/25/2007" "Git 1.5.3.rc3" "Git Manual" +.TH "GIT\-REV\-LIST" "1" "08/21/2007" "Git 1.5.3.rc5.46.g23d5" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -213,7 +213,7 @@ In addition to the \fI\fR listed on the command line, read them from the Omit any commit that introduces the same change as another commit on the "other side" when the set of commits are limited with symmetric difference. For example, if you have two branches, A and B, a usual way to list all commits on only one side of them is with \-\-left\-right, like the example above in the description of that option. It however shows the commits that were cherry\-picked from the other branch (for example, "3rd on b" may be cherry\-picked from branch A). With this option, such pairs of commits are excluded from the output. .TP \-g, \-\-walk\-reflogs -Instead of walking the commit ancestry chain, walk reflog entries from the most recent one to older ones. When this option is used you cannot specify commits to exclude (that is, \fI^commit\fR, \fIcommit1..commit2\fR, nor \fIcommit1\&...commit2\fR notations cannot be used). With \fI\-\-pretty\fR format other than oneline (for obvious reasons), this causes the output to have two extra lines of information taken from the reflog. By default, \fIcommit@{Nth}\fR notation is used in the output. When the starting commit is specified as instead. Under \fI\-\-pretty=oneline\fR, the commit message is prefixed with this information on the same line. +Instead of walking the commit ancestry chain, walk reflog entries from the most recent one to older ones. When this option is used you cannot specify commits to exclude (that is, \fI^commit\fR, \fIcommit1..commit2\fR, nor \fIcommit1\&...commit2\fR notations cannot be used). With \fI\-\-pretty\fR format other than oneline (for obvious reasons), this causes the output to have two extra lines of information taken from the reflog. By default, \fIcommit@{Nth}\fR notation is used in the output. When the starting commit is specified as instead. Under \fI\-\-pretty=oneline\fR, the commit message is prefixed with this information on the same line. Cannot be combined with \-\-reverse. .TP \-\-merge After a failed merge, show refs that touch files having a conflict and don't exist on all heads to merge. @@ -258,7 +258,7 @@ This option makes them appear in topological order (i.e. descendant commits are This option is similar to \fI\-\-topo\-order\fR in the sense that no parent comes before all of its children, but otherwise things are still ordered in the commit timestamp order. .TP \-\-reverse -Output the commits in reverse order. +Output the commits in reverse order. Cannot be combined with \-\-walk\-reflogs. .SS "Object Traversal" These options are mostly targeted for packing of git repositories. .TP diff --git a/man1/git-rev-parse.1 b/man1/git-rev-parse.1 index fce164f93..cadcbc80c 100644 --- a/man1/git-rev-parse.1 +++ b/man1/git-rev-parse.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-REV\-PARSE" "1" "08/11/2007" "Git 1.5.3.rc4.67.gf9286" "Git Manual" +.TH "GIT\-REV\-PARSE" "1" "08/21/2007" "Git 1.5.3.rc5.46.g23d5" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -143,7 +143,7 @@ A colon, followed by a slash, followed by a text: this names a commit whose comm A suffix \fI:\fR followed by a path; this names the blob or tree at the given path in the tree\-ish object named by the part before the colon. .TP \(bu -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. +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. 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 left\-to\-right. .sp diff --git a/man1/git-send-email.1 b/man1/git-send-email.1 index 1c10a3afd..3881ced77 100644 --- a/man1/git-send-email.1 +++ b/man1/git-send-email.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-SEND\-EMAIL" "1" "08/18/2007" "Git 1.5.3.rc5.19.g0734d" "Git Manual" +.TH "GIT\-SEND\-EMAIL" "1" "08/21/2007" "Git 1.5.3.rc5.46.g23d5" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -53,7 +53,7 @@ If set, specifies the outgoing SMTP server to use (e.g. smtp.example.com or a ra Specify the initial subject of the email thread. Only necessary if \-\-compose is also set. If \-\-compose is not set, this will be prompted for. .TP \-\-suppress\-from, \-\-no\-suppress\-from -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 \fIsendemail.suppressfrom\fR configuration value; if that is unspecified, default to \-\-no\-supress\-from. +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 \fIsendemail.suppressfrom\fR configuration value; if that is unspecified, default to \-\-no\-suppress\-from. .TP \-\-thread, \-\-no\-thread If this is set, the In\-Reply\-To header will be set on each email sent. If disabled with "\-\-no\-thread", no emails will have the In\-Reply\-To header set. Default is the value of the \fIsendemail.thread\fR configuration value; if that is unspecified, default to \-\-thread. diff --git a/man7/git.7 b/man7/git.7 index b75259543..fd04962f6 100644 --- a/man7/git.7 +++ b/man7/git.7 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT" "7" "08/16/2007" "Git 1.5.3.rc5.11.g312e" "Git Manual" +.TH "GIT" "7" "08/21/2007" "Git 1.5.3.rc5.46.g23d5" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -12,7 +12,8 @@ git \- the stupid content tracker .SH "SYNOPSIS" .sp .nf -\fIgit\fR [\-\-version] [\-\-exec\-path[=GIT_EXEC_PATH]] [\-p|\-\-paginate] +\fIgit\fR [\-\-version] [\-\-exec\-path[=GIT_EXEC_PATH]] + [\-p|\-\-paginate|\-\-no\-pager] [\-\-bare] [\-\-git\-dir=GIT_DIR] [\-\-work\-tree=GIT_WORK_TREE] [\-\-help] COMMAND [ARGS] .fi @@ -38,6 +39,9 @@ Path to wherever your core git programs are installed. This can also be controll \-p|\-\-paginate Pipe all output into \fIless\fR (or if set, $PAGER). .TP +\-\-no\-pager +Do not pipe git output into a pager. +.TP \-\-git\-dir= Set the path to the repository. This can also be controlled by setting the GIT_DIR environment variable. .TP