From 5aef2fdd0059fa5d2022ae0be83d711f50e49667 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 22 Jun 2006 19:49:50 +0000 Subject: [PATCH] Autogenerated man pages for v1.4.1-rc1 --- man1/git-clone-pack.1 | 67 ----------------------------------------- man1/git-clone.1 | 4 +-- man1/git-rebase.1 | 32 +++++++++++++++++++- man1/git-receive-pack.1 | 6 ++-- man1/git-repo-config.1 | 10 ++++++ man1/git-send-email.1 | 16 ++++++++++ man1/git-upload-pack.1 | 2 +- man7/git.7 | 6 +--- 8 files changed, 64 insertions(+), 79 deletions(-) delete mode 100755 man1/git-clone-pack.1 diff --git a/man1/git-clone-pack.1 b/man1/git-clone-pack.1 deleted file mode 100755 index 845d0216d..000000000 --- a/man1/git-clone-pack.1 +++ /dev/null @@ -1,67 +0,0 @@ -.\"Generated by db2man.xsl. Don't modify this, modify the source. -.de Sh \" Subsection -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. -.de Sp \" Vertical space (when we can't use .PP) -.if t .sp .5v -.if n .sp -.. -.de Ip \" List item -.br -.ie \\n(.$>=3 .ne \\$3 -.el .ne 3 -.IP "\\$1" \\$2 -.. -.TH "GIT-CLONE-PACK" 1 "" "" "" -.SH NAME -git-clone-pack \- Clones a repository by receiving packed objects -.SH "SYNOPSIS" - - -\fIgit\-clone\-pack\fR [\-\-exec=] [:] [...] - -.SH "DESCRIPTION" - - -Clones a repository into the current repository by invoking \fIgit\-upload\-pack\fR, possibly on the remote host via ssh, in the named repository, and stores the sent pack in the local repository\&. - -.SH "OPTIONS" - -.TP -\-\-exec= -Use this to specify the path to \fIgit\-upload\-pack\fR on the remote side, if it is not found on your $PATH\&. Installations of sshd ignore the user's environment setup scripts for login shells (e\&.g\&. \&.bash_profile) and your privately installed git may not be found on the system default $PATH\&. Another workaround suggested is to set up your $PATH in "\&.bashrc", but this flag is for people who do not want to pay the overhead for non\-interactive shells by having a lean \&.bashrc file (they set most of the things up in \&.bash_profile)\&. - -.TP - -A remote host that houses the repository\&. When this part is specified, \fIgit\-upload\-pack\fR is invoked via ssh\&. - -.TP - -The repository to sync from\&. - -.TP -... -The heads to update\&. This is relative to $GIT_DIR (e\&.g\&. "HEAD", "refs/heads/master")\&. When unspecified, all heads are updated to match the remote repository\&. - -Usually all the refs from existing repository are stored under the same name in the new repository\&. Giving explicit arguments instead writes the object names and refs to the standard output, just like get\-fetch\-pack does\&. - -.SH "AUTHOR" - - -Written by Linus Torvalds - -.SH "DOCUMENTATION" - - -Documentation by Junio C Hamano\&. - -.SH "GIT" - - -Part of the \fBgit\fR(7) suite - diff --git a/man1/git-clone.1 b/man1/git-clone.1 index 756868438..fe42614b2 100755 --- a/man1/git-clone.1 +++ b/man1/git-clone.1 @@ -59,7 +59,7 @@ If the reference repository is on the local machine automatically setup \&.git/o .TP \-\-quiet, \-q -Operate quietly\&. This flag is passed to "rsync" and "git\-clone\-pack" commands when given\&. +Operate quietly\&. This flag is passed to "rsync" and "git\-fetch\-pack" commands when given\&. .TP \-n @@ -75,7 +75,7 @@ Instead of using the branch name \fIorigin\fR to keep track of the upstream repo .TP \-\-upload\-pack , \-u -When given, and the repository to clone from is handled by \fIgit\-clone\-pack\fR, \fI\-\-exec=\fR is passed to the command to specify non\-default path for the command run on the other end\&. +When given, and the repository to clone from is handled by \fIgit\-fetch\-pack\fR, \fI\-\-exec=\fR is passed to the command to specify non\-default path for the command run on the other end\&. .TP \-\-template= diff --git a/man1/git-rebase.1 b/man1/git-rebase.1 index 56792f29e..a2b2b166a 100755 --- a/man1/git-rebase.1 +++ b/man1/git-rebase.1 @@ -23,7 +23,7 @@ git-rebase \- Rebase local commits to a new head .SH "SYNOPSIS" -\fIgit\-rebase\fR [\-\-onto ] [] +\fIgit\-rebase\fR [\-\-merge] [\-\-onto ] [] \fIgit\-rebase\fR \-\-continue | \-\-skip | \-\-abort @@ -125,6 +125,36 @@ Restart the rebasing process after having resolved a merge conflict\&. \-\-abort Restore the original branch and abort the rebase operation\&. +.TP +\-\-skip +Restart the rebasing process by skipping the current patch\&. This does not work with the \-\-merge option\&. + +.TP +\-\-merge +Use merging strategies to rebase\&. When the recursive (default) merge strategy is used, this allows rebase to be aware of renames on the upstream side\&. + +.TP +\-s , \-\-strategy= +Use the given merge strategy; can be supplied more than once to specify them in the order they should be tried\&. If there is no \-s option, a built\-in list of strategies is used instead (git\-merge\-recursive when merging a single head, git\-merge\-octopus otherwise)\&. This implies \-\-merge\&. + +.SH "MERGE STRATEGIES" + +.TP +resolve +This can only resolve two heads (i\&.e\&. the current branch and another branch you pulled from) using 3\-way merge algorithm\&. It tries to carefully detect criss\-cross merge ambiguities and is considered generally safe and fast\&. + +.TP +recursive +This can only resolve two heads using 3\-way merge algorithm\&. When there are more than one common ancestors that can be used for 3\-way merge, it creates a merged tree of the common ancestors and uses that as the reference tree for the 3\-way merge\&. This has been reported to result in fewer merge conflicts without causing mis\-merges by tests done on actual merge commits taken from Linux 2\&.6 kernel development history\&. Additionally this can detect and handle merges involving renames\&. This is the default merge strategy when pulling or merging one branch\&. + +.TP +octopus +This resolves more than two\-head case, but refuses to do complex merge that needs manual resolution\&. It is primarily meant to be used for bundling topic branch heads together\&. This is the default merge strategy when pulling or merging more than one branches\&. + +.TP +ours +This resolves any number of heads, but the result of the merge is always the current branch head\&. It is meant to be used to supersede old development history of side branches\&. + .SH "NOTES" diff --git a/man1/git-receive-pack.1 b/man1/git-receive-pack.1 index 579eec8f9..efa59b530 100755 --- a/man1/git-receive-pack.1 +++ b/man1/git-receive-pack.1 @@ -23,15 +23,15 @@ git-receive-pack \- Receive what is pushed into it .SH "SYNOPSIS" -git\-receive\-pack +\fIgit\-receive\-pack\fR .SH "DESCRIPTION" -Invoked by git\-send\-pack and updates the repository with the information fed from the remote end\&. +Invoked by \fIgit\-send\-pack\fR and updates the repository with the information fed from the remote end\&. -This command is usually not invoked directly by the end user\&. The UI for the protocol is on the git\-send\-pack side, and the program pair is meant to be used to push updates to remote repository\&. For pull operations, see git\-fetch\-pack and git\-clone\-pack\&. +This command is usually not invoked directly by the end user\&. The UI for the protocol is on the \fIgit\-send\-pack\fR side, and the program pair is meant to be used to push updates to remote repository\&. For pull operations, see \fIgit\-fetch\-pack\fR\&. The command allows for creation and fast forwarding of sha1 refs (heads/tags) on the remote end (strictly speaking, it is the local end receive\-pack runs, but to the user who is sitting at the send\-pack end, it is updating the remote\&. Confused?) diff --git a/man1/git-repo-config.1 b/man1/git-repo-config.1 index 09dc23591..54e0422de 100755 --- a/man1/git-repo-config.1 +++ b/man1/git-repo-config.1 @@ -96,6 +96,16 @@ Remove all matching lines from \&.git/config\&. \-l, \-\-list List all variables set in \&.git/config\&. +.SH "ENVIRONMENT" + +.TP +GIT_CONFIG +Take the configuration from the given file instead of \&.git/config\&. + +.TP +GIT_CONFIG_LOCAL +Currently the same as $GIT_CONFIG; when Git will support global configuration files, this will cause it to take the configuration from the global configuration file in addition to the given file\&. + .SH "EXAMPLE" diff --git a/man1/git-send-email.1 b/man1/git-send-email.1 index 494898575..eee00920f 100755 --- a/man1/git-send-email.1 +++ b/man1/git-send-email.1 @@ -38,10 +38,22 @@ The header of the email is configurable by command line options\&. If not specif The options available are: +.TP +\-\-bcc +Specify a "Bcc:" value for each email\&. + +.nf +The \-\-bcc option must be repeated for each user you want on the bcc list\&. +.fi + .TP \-\-cc Specify a starting "Cc:" value for each email\&. +.nf +The \-\-cc option must be repeated for each user you want on the cc list\&. +.fi + .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 @@ -82,6 +94,10 @@ Do not add the From: address to the cc: list, if it shows up in a From: line\&. \-\-to Specify the primary recipient of the emails generated\&. Generally, this will be the upstream maintainer of the project involved\&. +.nf +The \-\-to option must be repeated for each user you want on the to list\&. +.fi + .SH "AUTHOR" diff --git a/man1/git-upload-pack.1 b/man1/git-upload-pack.1 index 8f914cf41..6ffd9ca3a 100755 --- a/man1/git-upload-pack.1 +++ b/man1/git-upload-pack.1 @@ -28,7 +28,7 @@ git-upload-pack \- Send missing objects packed .SH "DESCRIPTION" -Invoked by \fIgit\-clone\-pack\fR and/or \fIgit\-fetch\-pack\fR, learns what objects the other side is missing, and sends them after packing\&. +Invoked by \fIgit\-fetch\-pack\fR, learns what objects the other side is missing, and sends them after packing\&. This command is usually not invoked directly by the end user\&. The UI for the protocol is on the \fIgit\-fetch\-pack\fR side, and the program pair is meant to be used to pull updates from a remote repository\&. For push operations, see \fIgit\-send\-pack\fR\&. diff --git a/man7/git.7 b/man7/git.7 index 34c0b6adc..dc3f2cc0c 100755 --- a/man7/git.7 +++ b/man7/git.7 @@ -219,10 +219,6 @@ In general, the interrogate commands do not touch the files in the working tree\ .SS "Synching repositories" -.TP -\fBgit\-clone\-pack\fR(1) -Clones a repository into the current repository (engine for ssh and local transport)\&. - .TP \fBgit\-fetch\-pack\fR(1) Updates from a remote repository (engine for ssh and local transport)\&. @@ -269,7 +265,7 @@ Updates auxiliary information on a dumb server to help clients discover referenc .TP \fBgit\-upload\-pack\fR(1) -Invoked by \fIgit\-clone\-pack\fR and \fIgit\-fetch\-pack\fR to push what are asked for\&. +Invoked by \fIgit\-fetch\-pack\fR to push what are asked for\&. .TP \fBgit\-upload\-tar\fR(1) -- 2.26.2