From: Junio C Hamano Date: Wed, 29 Aug 2007 07:31:49 +0000 (+0000) Subject: Autogenerated manpages for v1.5.3-rc7 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=eaa40586572552dcdefef8c719b884a5bc3c5fb3;p=git.git Autogenerated manpages for v1.5.3-rc7 --- diff --git a/man1/git-add.1 b/man1/git-add.1 index 0dc2381ab..6d132d949 100644 --- a/man1/git-add.1 +++ b/man1/git-add.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\-ADD" "1" "08/26/2007" "Git 1.5.3.rc6.39.g09b0" "Git Manual" +.TH "GIT\-ADD" "1" "08/29/2007" "Git 1.5.3.rc7" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -24,7 +24,7 @@ This command can be performed multiple times before a commit. It only adds the c The \fIgit status\fR command can be used to obtain a summary of which files have changes that are staged for the next commit. -The \fIgit add\fR command will not add ignored files by default. If any ignored files were explicitly specified on the command line, \fIgit add\fR will fail with a list of ignored files. Ignored files reached by directory recursion or filename globbing will be silently ignored. The \fIadd\fR command can be used to add ignored files with the \-f (force) option. +The \fIgit add\fR command will not add ignored files by default. If any ignored files were explicitly specified on the command line, \fIgit add\fR will fail with a list of ignored files. Ignored files reached by directory recursion or filename globbing performed by Git (quote your globs before the shell) will be silently ignored. The \fIadd\fR command can be used to add ignored files with the \-f (force) option. Please see \fBgit\-commit\fR(1) for alternative ways to add content to a commit. .SH "OPTIONS" diff --git a/man1/git-diff.1 b/man1/git-diff.1 index bda779356..d71736413 100644 --- a/man1/git-diff.1 +++ b/man1/git-diff.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\-DIFF" "1" "08/28/2007" "Git 1.5.3.rc6.54.g9277" "Git Manual" +.TH "GIT\-DIFF" "1" "08/29/2007" "Git 1.5.3.rc7" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -31,12 +31,12 @@ This is to view the changes between two arbitrary . \fIgit\-diff\fR [\-\-options] .. [\-\-] [\&...] This is synonymous to the previous form. If on one side is omitted, it will have the same effect as using HEAD instead. .TP -\fIgit\-diff\fR [\-\-options] \&... [\-\-] [\&...] -This form is to view the changes on the branch containing and up to the second , starting at a common ancestor of both . "git\-diff A\&...B" is equivalent to "git\-diff $(git\-merge\-base A B) B". You can omit any one of , which has the same effect as using HEAD instead. +\fIgit\-diff\fR [\-\-options] ... [\-\-] [\&...] +This form is to view the changes on the branch containing and up to the second , starting at a common ancestor of both . "git\-diff A...B" is equivalent to "git\-diff $(git\-merge\-base A B) B". You can omit any one of , which has the same effect as using HEAD instead. -Just in case if you are doing something exotic, it should be noted that all of the in the above description can be any . +Just in case if you are doing something exotic, it should be noted that all of the in the above description, except for the last two forms that use ".." notations, can be any . -For a more complete list of ways to spell , see "SPECIFYING REVISIONS" section in \fBgit\-rev\-parse\fR(1). However, "diff" is about comparing two _endpoints_, not ranges, and the range notations (".." and "\&...") do not mean a range as defined in the "SPECIFYING RANGES" section in \fBgit\-rev\-parse\fR(1). +For a more complete list of ways to spell , see "SPECIFYING REVISIONS" section in \fBgit\-rev\-parse\fR(1). However, "diff" is about comparing two _endpoints_, not ranges, and the range notations (".." and "...") do not mean a range as defined in the "SPECIFYING RANGES" section in \fBgit\-rev\-parse\fR(1). .SH "OPTIONS" .TP \-p diff --git a/man1/git-format-patch.1 b/man1/git-format-patch.1 index 4b1d1d916..2c370f09f 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" "08/25/2007" "Git 1.5.3.rc6.23.g0058" "Git Manual" +.TH "GIT\-FORMAT\-PATCH" "1" "08/29/2007" "Git 1.5.3.rc7" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -19,12 +19,20 @@ git\-format\-patch \- Prepare patches for e\-mail submission [\-\-in\-reply\-to=Message\-Id] [\-\-suffix=.] [\-\-ignore\-if\-in\-upstream] [\-\-subject\-prefix=Subject\-Prefix] - [..] + [ | ] .fi .SH "DESCRIPTION" -Prepare each commit between and with its patch in one file per commit, formatted to resemble UNIX mailbox format. If .. is not specified, the head of the current working tree is implied. For a more complete list of ways to spell and , see "SPECIFYING REVISIONS" section in \fBgit\-rev\-parse\fR(1). +Prepare each commit with its patch in one file per commit, formatted to resemble UNIX mailbox format. The output of this command is convenient for e\-mail submission or for use with \fBgit\-am\fR(1). -The output of this command is convenient for e\-mail submission or for use with \fBgit\-am\fR(1). +There are two ways to specify which commits to operate on. +.TP 3 +1. +A single commit, , specifies that the commits leading to the tip of the current branch that are not in the history that leads to the to be output. +.TP +2. +Generic expression (see "SPECIFYING REVISIONS" section in \fBgit\-rev\-parse\fR(1)) means the commits in the specified range. + +A single commit, when interpreted as a expression, means "everything that leads to that commit", but if you write \fIgit format\-patch \fR, the previous rule applies to that command line and you do not get "everything since the beginning of the time". If you want to format everything since project inception to one commit, say "git format\-patch \-\-root " to make it clear that it is the latter case. By default, each output file is numbered sequentially from 1, and uses the first line of the commit message (massaged for pathname safety) as the filename. With the \-\-numbered\-files option, the output file names will only be numbers, without the first line of the commit appended. The names of the output files are printed to standard output, unless the \-\-stdout option is specified. @@ -235,6 +243,9 @@ Extract commits between revisions R1 and R2, and apply them on top of the curren git\-format\-patch origin Extract all commits which are in the current branch but not in the origin branch. For each commit a separate file is created in the current directory. .TP +git\-format\-patch \-\-root origin +Extract all commits which that leads to \fIorigin\fR since the inception of the project. +.TP git\-format\-patch \-M \-B origin The same as the previous one. Additionally, it detects and handles renames and complete rewrites intelligently to produce a renaming patch. A renaming patch reduces the amount of text output, and generally makes it easier to review it. Note that the "patch" program does not understand renaming patches, so use it only when you know the recipient uses git to apply your patch. .TP diff --git a/man1/git-log.1 b/man1/git-log.1 index 0b5f05011..4bcfc55c8 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/21/2007" "Git 1.5.3.rc5.46.g23d5" "Git Manual" +.TH "GIT\-LOG" "1" "08/29/2007" "Git 1.5.3.rc7" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -271,7 +271,7 @@ Show all commits since version \fIv2.6.12\fR that changed any file in the includ git log \-\-since="2 weeks ago" \-\- gitk Show the changes during the last two weeks to the file \fIgitk\fR. The "\-\-" is necessary to avoid confusion with the \fBbranch\fR named \fIgitk\fR .TP -git log \-r \-\-name\-status release..test +git log \-\-name\-status release..test Show the commits that are in the "test" branch but not yet in the "release" branch, along with the list of paths each commit modifies. .TP git log \-\-follow builtin\-rev\-list.c diff --git a/man1/git-svn.1 b/man1/git-svn.1 index 863f22209..7a7652194 100644 --- a/man1/git-svn.1 +++ b/man1/git-svn.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\-SVN" "1" "08/25/2007" "Git 1.5.3.rc6.23.g0058" "Git Manual" +.TH "GIT\-SVN" "1" "08/29/2007" "Git 1.5.3.rc7" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -318,7 +318,7 @@ git\-svn stores [svn\-remote] configuration information in the repository .git/c .ft .fi -Keep in mind that the \fI\fR\fI (asterisk) wildcard of the local ref (left of the \fR\fI\fI:\fR\fR\fI) *must\fR be the farthest right path component; however the remote wildcard may be anywhere as long as it's own independent path component (surrounded by \fI/\fR or EOL). This type of configuration is not automatically created by \fIinit\fR and should be manually entered with a text\-editor or using \fBgit\-config\fR(1) +Keep in mind that the \fI\fR\fI (asterisk) wildcard of the local ref (right of the \fR\fI\fI:\fR\fR\fI) *must\fR be the farthest right path component; however the remote wildcard may be anywhere as long as it's own independent path component (surrounded by \fI/\fR or EOL). This type of configuration is not automatically created by \fIinit\fR and should be manually entered with a text\-editor or using \fBgit\-config\fR(1) .SH "SEE ALSO" \fBgit\-rebase\fR(1) .SH "AUTHOR"