From 54ae999c809cc88b70e4934ee73d725d8f4856af Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 12 Mar 2007 07:29:40 +0000 Subject: [PATCH] Autogenerated man pages for v1.5.0.3-382-g34572 --- man1/git-commit.1 | 10 +++++++--- man1/git-fast-import.1 | 8 ++++---- man1/git-format-patch.1 | 14 +++++++++----- man1/git-receive-pack.1 | 25 ++++++++++++------------- man1/git-send-email.1 | 20 ++++++++++++++++++-- man7/git.7 | 2 +- 6 files changed, 51 insertions(+), 28 deletions(-) diff --git a/man1/git-commit.1 b/man1/git-commit.1 index aa277cbca..ee7eaef64 100644 --- a/man1/git-commit.1 +++ b/man1/git-commit.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\-COMMIT" "1" "03/02/2007" "" "" +.TH "GIT\-COMMIT" "1" "03/12/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -12,8 +12,9 @@ git\-commit \- Record changes to the repository .SH "SYNOPSIS" .sp .nf -\fIgit\-commit\fR [\-a] [\-s] [\-v] [(\-c | \-C) | \-F | \-m | - \-\-amend] [\-\-no\-verify] [\-e] [\-\-author ] +\fIgit\-commit\fR [\-a | \-\-interactive] [\-s] [\-v] + [(\-c | \-C) | \-F | \-m | \-\-amend] + [\-\-no\-verify] [\-e] [\-\-author ] [\-\-] [[\-i | \-o ]\&...] .fi .SH "DESCRIPTION" @@ -30,6 +31,9 @@ by directly listing files containing changes to be committed as arguments to the .TP 4. by using the \-a switch with the \fIcommit\fR command to automatically "add" changes from all known files i.e. files that have already been committed before, and to automatically "rm" files that have been removed from the working tree, and perform the actual commit. +.TP +5. +by using the \-\-interactive switch with the \fIcommit\fR command to decide one by one which files should be part of the commit, before finalizing the operation. Currently, this is done by invoking git\-add \-\-interactive. The \fBgit\-status\fR(1) command can be used to obtain a summary of what is included by any of the above for the next commit by giving the same set of parameters you would give to this command. diff --git a/man1/git-fast-import.1 b/man1/git-fast-import.1 index 607b3a01c..b8d070898 100644 --- a/man1/git-fast-import.1 +++ b/man1/git-fast-import.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\-FAST\-IMPORT" "1" "03/09/2007" "" "" +.TH "GIT\-FAST\-IMPORT" "1" "03/12/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -251,7 +251,7 @@ In both formats is the type of file entry, specified in octal. Git only s In both formats is the complete path of the file to be added (if not already existing) or modified (if already existing). -A string must use UNIX\-style directory seperators (forward slash /), may contain any byte other than LF, and must not start with double quote ("). +A string must use UNIX\-style directory separators (forward slash /), may contain any byte other than LF, and must not start with double quote ("). If an LF or double quote must be encoded into shell\-style quoting should be used, e.g. "path/with\\n and \\" in it". @@ -261,10 +261,10 @@ The value of must be in canoncial form. That is it must not: contain an empty directory component (e.g. foo//bar is invalid), .TP \(bu -end with a directory seperator (e.g. foo/ is invalid), +end with a directory separator (e.g. foo/ is invalid), .TP \(bu -start with a directory seperator (e.g. /foo is invalid), +start with a directory separator (e.g. /foo is invalid), .TP \(bu contain the special component . or .. (e.g. foo/./bar and foo/../bar are invalid). diff --git a/man1/git-format-patch.1 b/man1/git-format-patch.1 index e2c9ffc81..1b52d19c1 100644 --- a/man1/git-format-patch.1 +++ b/man1/git-format-patch.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\-FORMAT\-PATCH" "1" "03/06/2007" "" "" +.TH "GIT\-FORMAT\-PATCH" "1" "03/12/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -12,8 +12,9 @@ git\-format\-patch \- Prepare patches for e\-mail submission .SH "SYNOPSIS" .sp .nf -\fIgit\-format\-patch\fR [] [\-n | \-k] [\-o | \-\-stdout] - [\-\-attach] [\-\-thread] [\-s | \-\-signoff] [\-\-start\-number ] +\fIgit\-format\-patch\fR [\-n | \-k] [\-o | \-\-stdout] [\-\-thread] + [\-\-attach[=] | \-\-inline[=]] + [\-s | \-\-signoff] [] [\-\-start\-number ] [\-\-in\-reply\-to=Message\-Id] [\-\-suffix=.] [\-\-ignore\-if\-in\-upstream] [..] @@ -166,8 +167,11 @@ Add Signed\-off\-by: line to the commit message, using the committer identity of \-\-stdout Print all commits to the standard output in mbox format, instead of creating a file for each one. .TP -\-\-attach -Create attachments instead of inlining patches. +\-\-attach[=] +Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with "Content\-Disposition: attachment". +.TP +\-\-inline[=] +Create multipart/mixed attachment, the first part of which is the commit message and the patch itself in the second part, with "Content\-Disposition: inline". .TP \-\-thread Add In\-Reply\-To and References headers to make the second and subsequent mails appear as replies to the first. Also generates the Message\-Id header to reference. diff --git a/man1/git-receive-pack.1 b/man1/git-receive-pack.1 index ff5f4f643..e0b0531b5 100644 --- a/man1/git-receive-pack.1 +++ b/man1/git-receive-pack.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\-RECEIVE\-PACK" "1" "03/08/2007" "" "" +.TH "GIT\-RECEIVE\-PACK" "1" "03/12/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -26,12 +26,12 @@ git\-receive\-pack honours the receive.denyNonFastForwards config option, which The repository to sync into. .SH "PRE\-RECEIVE HOOK" -Before any ref is updated, if $GIT_DIR/hooks/pre\-receive file exists and is executable, it will be invoked once, with three parameters per ref to be updated: +Before any ref is updated, if $GIT_DIR/hooks/pre\-receive file exists and is executable, it will be invoked once with no parameters. The standard input of the hook will be one line per ref to be updated: .sp .nf -$GIT_DIR/hooks/pre\-receive (refname sha1\-old sha1\-new)+ +sha1\-old SP sha1\-new SP refname LF .fi -The refname parameter is relative to $GIT_DIR; e.g. for the master head this is "refs/heads/master". The two sha1 arguments after each refname are the object names for the refname before and after sha1\-old and sha1\-new should be valid objects in the repository. +The refname value is relative to $GIT_DIR; e.g. for the master head this is "refs/heads/master". The two sha1 values before each refname are the object names for the refname before and after sha1\-old and sha1\-new should be valid objects in the repository. This hook is called before any refname is updated and before any fast\-forward checks are performed. @@ -48,30 +48,29 @@ The hook should exit with non\-zero status if it wants to disallow updating the Successful execution (a zero exit status) of this hook does not ensure the ref will actully be updated, it is only a prerequisite. As such it is not a good idea to send notices (e.g. email) from this hook. Consider using the post\-receive hook instead. .SH "POST\-RECEIVE HOOK" -After all refs were updated (or attempted to be updated), if any ref update was successful, and if $GIT_DIR/hooks/post\-receive file exists and is executable, it will be invoke once with three parameters for each successfully updated ref: +After all refs were updated (or attempted to be updated), if any ref update was successful, and if $GIT_DIR/hooks/post\-receive file exists and is executable, it will be invoke once with no parameters. The standard input of the hook will be one line for each successfully updated ref: .sp .nf -$GIT_DIR/hooks/post\-receive (refname sha1\-old sha1\-new)+ +sha1\-old SP sha1\-new SP refname LF .fi -The refname parameter is relative to $GIT_DIR; e.g. for the master head this is "refs/heads/master". The two sha1 arguments after each refname are the object names for the refname before and after the update. Refs that were created will have sha1\-old equal to the repository. +The refname value is relative to $GIT_DIR; e.g. for the master head this is "refs/heads/master". The two sha1 values before each refname are the object names for the refname before and after the update. Refs that were created will have sha1\-old equal to the repository. Using this hook, it is easy to generate mails describing the updates to the repository. This example script sends one mail message per ref listing the commits pushed to the repository: .sp .nf #!/bin/sh # mail out commit update information. -while test $# \-gt 0 +while read oval nval ref do - if expr "$2" : '0*$' >/dev/null + if expr "$oval" : '0*$' >/dev/null then echo "Created a new ref, with the following commits:" - git\-rev\-list \-\-pretty "$2" + git\-rev\-list \-\-pretty "$nval" else echo "New commits:" - git\-rev\-list \-\-pretty "$3" "^$2" + git\-rev\-list \-\-pretty "$nval" "^$oval" fi | - mail \-s "Changes to ref $1" commit\-list@mydomain - shift; shift; shift; # discard this ref's args + mail \-s "Changes to ref $ref" commit\-list@mydomain done exit 0 .fi diff --git a/man1/git-send-email.1 b/man1/git-send-email.1 index 2c50ea283..8a3dcc315 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" "03/02/2007" "" "" +.TH "GIT\-SEND\-EMAIL" "1" "03/12/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -29,7 +29,7 @@ Specify a starting "Cc:" value for each email. The \-\-cc option must be repeated for each user you want on the cc list. .TP \-\-chain\-reply\-to, \-\-no\-chain\-reply\-to -If this is set, each email will be sent as a reply to the previous email sent. If disabled with "\-\-no\-chain\-reply\-to", all emails after the first will be sent as replies to the first email sent. When using this, it is recommended that the first file given be an overview of the entire patch series. Default is \-\-chain\-reply\-to +If this is set, each email will be sent as a reply to the previous email sent. If disabled with "\-\-no\-chain\-reply\-to", all emails after the first will be sent as replies to the first email sent. When using this, it is recommended that the first file given be an overview of the entire patch series. Default is the value of the \fIsendemail.chainreplyto\fR configuration value; if that is unspecified, default to \-\-chain\-reply\-to. .TP \-\-compose Use $EDITOR to edit an introductory message for the patch series. @@ -59,6 +59,22 @@ Do not add the From: address to the cc: list, if it shows up in a From: line. Specify the primary recipient of the emails generated. Generally, this will be the upstream maintainer of the project involved. The \-\-to option must be repeated for each user you want on the to list. +.SH "CONFIGURATION" +.TP +sendemail.aliasesfile +To avoid typing long email addresses, point this to one or more email aliases files. You must also supply \fIsendemail.aliasfiletype\fR. +.TP +sendemail.aliasfiletype +Format of the file(s) specified in sendemail.aliasesfile. Must be one of \fImutt\fR, \fImailrc\fR, \fIpine\fR, or \fIgnus\fR. +.TP +sendemail.bcc +Email address (or alias) to always bcc. +.TP +sendemail.chainreplyto +Boolean value specifying the default to the \fI\-\-chain_reply_to\fR parameter. +.TP +sendemail.smtpserver +Default smtp server to use. .SH "AUTHOR" Written by Ryan Anderson diff --git a/man7/git.7 b/man7/git.7 index fb31a228d..c6989f886 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" "03/09/2007" "" "" +.TH "GIT" "7" "03/12/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) -- 2.26.2