From 4991ba61a1d41e5008dbd8e17c42dba9cb8fee05 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 25 Mar 2007 07:55:07 +0000 Subject: [PATCH] Autogenerated man pages for v1.5.1-rc1-63-g12d6 --- man1/git-am.1 | 21 ++++++++++++++++++++- man1/git-diff-files.1 | 5 ++++- man1/git-diff-index.1 | 5 ++++- man1/git-diff-tree.1 | 5 ++++- man1/git-diff.1 | 5 ++++- man1/git-format-patch.1 | 5 ++++- man7/git.7 | 2 +- 7 files changed, 41 insertions(+), 7 deletions(-) diff --git a/man1/git-am.1 b/man1/git-am.1 index e2d9aa84a..0723bfb91 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" "03/23/2007" "" "" +.TH "GIT\-AM" "1" "03/25/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -62,6 +62,25 @@ Run interactively, just like git\-applymbox. \-\-resolved After a patch failure (e.g. attempting to apply conflicting patch), the user has applied it by hand and the index file stores the result of the application. Make a commit using the authorship and commit log extracted from the e\-mail message and the current index file, and continue. .SH "DISCUSSION" +The commit author name is taken from the "From: " line of the message, and commit author time is taken from the "Date: " line of the message. The "Subject: " line is used as the title of the commit, after stripping common prefix "[PATCH ]". It is supposed to describe what the commit is about concisely as a one line text. + +The body of the message (iow, after a blank line that terminates RFC2822 headers) can begin with "Subject: " and "From: " lines that are different from those of the mail header, to override the values of these fields. + +The commit message is formed by the title taken from the "Subject: ", a blank line and the body of the message up to where the patch begins. Excess whitespaces at the end of the lines are automatically stripped. + +The patch is expected to be inline, directly following the message. Any line that is of form: +.TP 3 +\(bu +three\-dashes and end\-of\-line, or +.TP +\(bu +a line that begins with "diff \-", or +.TP +\(bu +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: .TP 3 1. diff --git a/man1/git-diff-files.1 b/man1/git-diff-files.1 index f0cea586a..798a9d46e 100644 --- a/man1/git-diff-files.1 +++ b/man1/git-diff-files.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\-FILES" "1" "03/19/2007" "" "" +.TH "GIT\-DIFF\-FILES" "1" "03/25/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -131,6 +131,9 @@ Shorthand for "\-\-ignore\-all\-space". .TP \-\-exit\-code Make the program exit with codes similar to diff(1). That is, it exits with 1 if there were differences and 0 means no differences. +.TP +\-\-quiet +Disable all output of the program. Implies \-\-exit\-code. For more detailed explanation on these common options, see also [1]\&\fIdiffcore documentation\fR. .TP diff --git a/man1/git-diff-index.1 b/man1/git-diff-index.1 index 337dfc804..49a0e86e2 100644 --- a/man1/git-diff-index.1 +++ b/man1/git-diff-index.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\-INDEX" "1" "03/19/2007" "" "" +.TH "GIT\-DIFF\-INDEX" "1" "03/25/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -131,6 +131,9 @@ Shorthand for "\-\-ignore\-all\-space". .TP \-\-exit\-code Make the program exit with codes similar to diff(1). That is, it exits with 1 if there were differences and 0 means no differences. +.TP +\-\-quiet +Disable all output of the program. Implies \-\-exit\-code. For more detailed explanation on these common options, see also [1]\&\fIdiffcore documentation\fR. .TP diff --git a/man1/git-diff-tree.1 b/man1/git-diff-tree.1 index f3109a1f4..16c9ccdcc 100644 --- a/man1/git-diff-tree.1 +++ b/man1/git-diff-tree.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\-TREE" "1" "03/19/2007" "" "" +.TH "GIT\-DIFF\-TREE" "1" "03/25/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -140,6 +140,9 @@ Shorthand for "\-\-ignore\-all\-space". .TP \-\-exit\-code Make the program exit with codes similar to diff(1). That is, it exits with 1 if there were differences and 0 means no differences. +.TP +\-\-quiet +Disable all output of the program. Implies \-\-exit\-code. For more detailed explanation on these common options, see also [1]\&\fIdiffcore documentation\fR. .TP diff --git a/man1/git-diff.1 b/man1/git-diff.1 index 24a779337..eb793fbb5 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" "03/19/2007" "" "" +.TH "GIT\-DIFF" "1" "03/25/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -153,6 +153,9 @@ Shorthand for "\-\-ignore\-all\-space". .TP \-\-exit\-code Make the program exit with codes similar to diff(1). That is, it exits with 1 if there were differences and 0 means no differences. +.TP +\-\-quiet +Disable all output of the program. Implies \-\-exit\-code. For more detailed explanation on these common options, see also [1]\&\fIdiffcore documentation\fR. .TP diff --git a/man1/git-format-patch.1 b/man1/git-format-patch.1 index 413cad6ba..2904709d8 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/19/2007" "" "" +.TH "GIT\-FORMAT\-PATCH" "1" "03/25/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -149,6 +149,9 @@ Shorthand for "\-\-ignore\-all\-space". .TP \-\-exit\-code Make the program exit with codes similar to diff(1). That is, it exits with 1 if there were differences and 0 means no differences. +.TP +\-\-quiet +Disable all output of the program. Implies \-\-exit\-code. For more detailed explanation on these common options, see also [1]\&\fIdiffcore documentation\fR. .TP diff --git a/man7/git.7 b/man7/git.7 index 044ecbe06..aaa3c3529 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/24/2007" "" "" +.TH "GIT" "7" "03/25/2007" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) -- 2.26.2