From 2b074188ccbed88a62656960bf357ce9f9d8f9fb Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 3 Jun 2007 08:40:16 +0000 Subject: [PATCH] Autogenerated manpages for v1.5.2.1-111-gc94b --- man1/git-am.1 | 6 ++--- man1/git-applymbox.1 | 51 ------------------------------------------- man1/git-applypatch.1 | 39 --------------------------------- man1/git-mailinfo.1 | 4 ++-- man1/git-submodule.1 | 40 +++++++++++++++++++++++++++++++++ man7/git.7 | 11 ++++------ 6 files changed, 49 insertions(+), 102 deletions(-) delete mode 100644 man1/git-applymbox.1 delete mode 100644 man1/git-applypatch.1 create mode 100644 man1/git-submodule.1 diff --git a/man1/git-am.1 b/man1/git-am.1 index a037e2880..c54605e08 100644 --- a/man1/git-am.1 +++ b/man1/git-am.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\-AM" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual" +.TH "GIT\-AM" "1" "06/03/2007" "Git 1.5.2.1.111.gc94b" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -85,7 +85,7 @@ a line that begins with "Index: " is taken as the beginning of a patch, and the commit log message is terminated before the first occurrence of such a line. -When initially invoking it, you give it names of the mailboxes to crunch. Upon seeing the first patch that does not apply, it aborts in the middle, just like \fIgit\-applymbox\fR does. You can recover from this in one of two ways: +When initially invoking it, you give it names of the mailboxes to crunch. Upon seeing the first patch that does not apply, it aborts in the middle,. You can recover from this in one of two ways: .TP 3 1. skip the current patch by re\-running the command with \fI\-\-skip\fR option. @@ -95,7 +95,7 @@ hand resolve the conflict in the working directory, and update the index file to The command refuses to process new mailboxes while .dotest directory exists, so if you decide to start over from scratch, run rm \-f .dotest before running the command with mailbox names. .SH "SEE ALSO" -\fBgit\-applymbox\fR(1), \fBgit\-applypatch\fR(1), \fBgit\-apply\fR(1). +\fBgit\-apply\fR(1). .SH "AUTHOR" Written by Junio C Hamano .SH "DOCUMENTATION" diff --git a/man1/git-applymbox.1 b/man1/git-applymbox.1 deleted file mode 100644 index fd7cd69eb..000000000 --- a/man1/git-applymbox.1 +++ /dev/null @@ -1,51 +0,0 @@ -.\" ** You probably do not want to edit this file directly ** -.\" 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\-APPLYMBOX" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual" -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.SH "NAME" -git\-applymbox \- Apply a series of patches in a mailbox -.SH "SYNOPSIS" -\fIgit\-applymbox\fR [\-u] [\-k] [\-q] [\-m] ( \-c .dotest/ | ) [ ] -.SH "DESCRIPTION" -Splits mail messages in a mailbox into commit log message, authorship information and patches, and applies them to the current branch. -.SH "OPTIONS" -.TP -\-q -Apply patches interactively. The user will be given opportunity to edit the log message and the patch before attempting to apply it. -.TP -\-k -Usually the program \fIcleans up\fR the Subject: header line to extract the title line for the commit log message, among which (1) remove \fIRe:\fR or \fIre:\fR, (2) leading whitespaces, (3) \fI[\fR up to \fI]\fR, typically \fI[PATCH]\fR, and then prepends "[PATCH] ". This flag forbids this munging, and is most useful when used to read back \fIgit format\-patch \-k\fR output. -.TP -\-m -Patches are applied with git\-apply command, and unless it cleanly applies without fuzz, the processing fails. With this flag, if a tree that the patch applies cleanly is found in a repository, the patch is applied to the tree and then a 3\-way merge between the resulting tree and the current tree. -.TP -\-u -Pass \-u flag to git\-mailinfo (see \fBgit\-mailinfo\fR(1)). The proposed commit log message taken from the e\-mail are re\-coded into UTF\-8 encoding (configuration variable i18n.commitencoding can be used to specify project's preferred encoding if it is not UTF\-8). This used to be optional but now it is the default. - -Note that the patch is always used as\-is without charset conversion, even with this flag. -.TP -\-n -Pass \-n flag to git\-mailinfo (see \fBgit\-mailinfo\fR(1)). -.TP -\-c .dotest/ -When the patch contained in an e\-mail does not cleanly apply, the command exits with an error message. The patch and extracted message are found in .dotest/, and you could re\-run \fIgit applymbox\fR with \fI\-c .dotest/\fR flag to restart the process after inspecting and fixing them. -.TP - -The name of the file that contains the e\-mail messages with patches. This file should be in the UNIX mailbox format. See \fISubmittingPatches\fR document to learn about the formatting convention for e\-mail submission. -.TP - -The name of the file that contains your "Signed\-off\-by" line. See \fISubmittingPatches\fR document to learn what "Signed\-off\-by" line means. You can also just say \fIyes\fR, \fItrue\fR, \fIme\fR, or \fIplease\fR to use an automatically generated "Signed\-off\-by" line based on your committer identity. -.SH "SEE ALSO" -\fBgit\-am\fR(1), \fBgit\-applypatch\fR(1). -.SH "AUTHOR" -Written by Linus Torvalds -.SH "DOCUMENTATION" -Documentation by Junio C Hamano and the git\-list . -.SH "GIT" -Part of the \fBgit\fR(7) suite - diff --git a/man1/git-applypatch.1 b/man1/git-applypatch.1 deleted file mode 100644 index 68b74a6ef..000000000 --- a/man1/git-applypatch.1 +++ /dev/null @@ -1,39 +0,0 @@ -.\" ** You probably do not want to edit this file directly ** -.\" 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\-APPLYPATCH" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual" -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.SH "NAME" -git\-applypatch \- Apply one patch extracted from an e\-mail -.SH "SYNOPSIS" -\fIgit\-applypatch\fR [] -.SH "DESCRIPTION" -This is usually not what an end user wants to run directly. See \fBgit\-am\fR(1) instead. - -Takes three files , , and prepared from an e\-mail message by \fIgit\-mailinfo\fR, and creates a commit. It is usually not necessary to use this command directly. - -This command can run applypatch\-msg, pre\-applypatch, and post\-applypatch hooks. See [1]\&\fIhooks\fR for more information. -.SH "OPTIONS" -.TP - -Commit log message (sans the first line, which comes from e\-mail Subject stored in ). -.TP - -The patch to apply. -.TP - -Author and subject information extracted from e\-mail, used on "author" line and as the first line of the commit log message. -.SH "AUTHOR" -Written by Linus Torvalds -.SH "DOCUMENTATION" -Documentation by Junio C Hamano and the git\-list . -.SH "GIT" -Part of the \fBgit\fR(7) suite -.SH "REFERENCES" -.TP 3 -1.\ hooks -\%hooks.html diff --git a/man1/git-mailinfo.1 b/man1/git-mailinfo.1 index 4e4712820..3243c683a 100644 --- a/man1/git-mailinfo.1 +++ b/man1/git-mailinfo.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\-MAILINFO" "1" "06/02/2007" "Git 1.5.2.167.g4bc70" "Git Manual" +.TH "GIT\-MAILINFO" "1" "06/03/2007" "Git 1.5.2.1.111.gc94b" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -12,7 +12,7 @@ git\-mailinfo \- Extracts patch and authorship from a single e\-mail message .SH "SYNOPSIS" \fIgit\-mailinfo\fR [\-k] [\-u | \-\-encoding=] .SH "DESCRIPTION" -Reading a single e\-mail message from the standard input, and writes the commit log message in file, and the patches in file. The author name, e\-mail and e\-mail subject are written out to the standard output to be used by git\-applypatch to create a commit. It is usually not necessary to use this command directly. See \fBgit\-am\fR(1) instead. +Reading a single e\-mail message from the standard input, and writes the commit log message in file, and the patches in file. The author name, e\-mail and e\-mail subject are written out to the standard output to be used by git\-am to create a commit. It is usually not necessary to use this command directly. See \fBgit\-am\fR(1) instead. .SH "OPTIONS" .TP \-k diff --git a/man1/git-submodule.1 b/man1/git-submodule.1 new file mode 100644 index 000000000..7bcaa1afa --- /dev/null +++ b/man1/git-submodule.1 @@ -0,0 +1,40 @@ +.\" ** You probably do not want to edit this file directly ** +.\" 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\-SUBMODULE" "1" "06/03/2007" "Git 1.5.2.1.111.gc94b" "Git Manual" +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.SH "NAME" +git\-submodule \- Initialize, update or inspect submodules +.SH "SYNOPSIS" +\fIgit\-submodule\fR [\-\-quiet] [\-\-cached] [status|init|update] [\-\-] [\&...] +.SH "COMMANDS" +.TP +status +Show the status of the submodules. This will print the SHA\-1 of the currently checked out commit for each submodule, along with the submodule path and the output of \fBgit\-describe\fR(1) for the SHA\-1. Each SHA\-1 will be prefixed with \- if the submodule is not initialized and + if the currently checked out submodule commit does not match the SHA\-1 found in the index of the containing repository. This command is the default command for git\-submodule. +.TP +init +Initialize the submodules, i.e. clone the git repositories specified in the .gitmodules file and checkout the submodule commits specified in the index of the containing repository. This will make the submodules HEAD be detached. +.TP +update +Update the initialized submodules, i.e. checkout the submodule commits specified in the index of the containing repository. This will make the submodules HEAD be detached. +.SH "OPTIONS" +.TP +\-q, \-\-quiet +Only print error messages. +.TP +\-\-cached +Display the SHA\-1 stored in the index, not the SHA\-1 of the currently checked out submodule commit. This option is only valid for the status command. +.TP + +Path to submodule(s). When specified this will restrict the command to only operate on the submodules found at the specified paths. +.SH "FILES" +When cloning submodules, a .gitmodules file in the top\-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as $GIR_DIR/config. The key to each submodule url is "module.$path.url". +.SH "AUTHOR" +Written by Lars Hjemli +.SH "GIT" +Part of the \fBgit\fR(7) suite + diff --git a/man7/git.7 b/man7/git.7 index db1a46f2f..baaaf5046 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" "06/02/2007" "Git 1.5.2" "Git Manual" +.TH "GIT" "7" "06/03/2007" "Git 1.5.2.1.111.gc94b" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -147,6 +147,9 @@ Show various types of objects. \fBgit\-status\fR(1) Show the working tree status. .TP +\fBgit\-submodule\fR(1) +Initialize, update or inspect submodules. +.TP \fBgit\-tag\fR(1) Create, list, delete or verify a tag object signed with GPG. .SS "Ancillary Commands" @@ -190,9 +193,6 @@ Interrogators: \fBgit\-annotate\fR(1) Annotate file lines with commit info. .TP -\fBgit\-applymbox\fR(1) -Apply a series of patches in a mailbox. -.TP \fBgit\-blame\fR(1) Show what revision and author last modified each line of a file. .TP @@ -426,9 +426,6 @@ Send objects packed back to git\-fetch\-pack. .SS "Internal helper commands" These are internal helper commands used by other commands; end users typically do not use them directly. .TP -\fBgit\-applypatch\fR(1) -Apply one patch extracted from an e\-mail. -.TP \fBgit\-check\-attr\fR(1) Display gitattributes information.. .TP -- 2.26.2