From 35e5755744795aed16e69dd2ad48b03022d698b5 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 25 Mar 2007 07:54:35 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.1-rc1-63-g12d6 --- diff-options.txt | 3 +++ git-am.html | 37 ++++++++++++++++++++++++++++++++++++- git-am.txt | 27 +++++++++++++++++++++++++++ git-diff-files.html | 10 +++++++++- git-diff-index.html | 10 +++++++++- git-diff-tree.html | 10 +++++++++- git-diff.html | 10 +++++++++- git-format-patch.html | 10 +++++++++- git.html | 2 +- 9 files changed, 112 insertions(+), 7 deletions(-) diff --git a/diff-options.txt b/diff-options.txt index 77a3f78dd..1689c7481 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -164,5 +164,8 @@ That is, it exits with 1 if there were differences and 0 means no differences. +--quiet:: + Disable all output of the program. Implies --exit-code. + For more detailed explanation on these common options, see also link:diffcore.html[diffcore documentation]. diff --git a/git-am.html b/git-am.html index cf5fead8f..864335468 100644 --- a/git-am.html +++ b/git-am.html @@ -417,6 +417,41 @@ default. You could use --no-utf8 to override this.

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 <anything>]". +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:

+ +

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 git-applymbox does. You can @@ -459,7 +494,7 @@ names.

diff --git a/git-am.txt b/git-am.txt index 13a738986..148ce4056 100644 --- a/git-am.txt +++ b/git-am.txt @@ -87,6 +87,33 @@ default. You could use `--no-utf8` to override this. 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: + +* three-dashes and end-of-line, or +* a line that begins with "diff -", or +* 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 'git-applymbox' does. You can diff --git a/git-diff-files.html b/git-diff-files.html index 93df142be..56df9da74 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -645,6 +645,14 @@ same as "git-diff-index" and "git-diff-tree".

0 means no differences.

+
+--quiet +
+
+

+ Disable all output of the program. Implies --exit-code. +

+

For more detailed explanation on these common options, see also diffcore documentation.

@@ -1021,7 +1029,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff-index.html b/git-diff-index.html index 9e809f42e..3508dd982 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -646,6 +646,14 @@ entries in the index are compared.

0 means no differences.

+
+--quiet +
+
+

+ Disable all output of the program. Implies --exit-code. +

+

For more detailed explanation on these common options, see also diffcore documentation.

@@ -1103,7 +1111,7 @@ always have the special all-zero sha1. diff --git a/git-diff-tree.html b/git-diff-tree.html index 6226c358f..7b2f25761 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -648,6 +648,14 @@ git-diff-tree(1) Manual Page 0 means no differences.

+
+--quiet +
+
+

+ Disable all output of the program. Implies --exit-code. +

+

For more detailed explanation on these common options, see also diffcore documentation.

@@ -1455,7 +1463,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff.html b/git-diff.html index ca2550cef..2356647b2 100644 --- a/git-diff.html +++ b/git-diff.html @@ -700,6 +700,14 @@ any <tree-ish>.

0 means no differences.

+
+--quiet +
+
+

+ Disable all output of the program. Implies --exit-code. +

+

For more detailed explanation on these common options, see also diffcore documentation.

@@ -852,7 +860,7 @@ output diff in reverse. diff --git a/git-format-patch.html b/git-format-patch.html index d24bf3d8b..f2c6adaa0 100644 --- a/git-format-patch.html +++ b/git-format-patch.html @@ -667,6 +667,14 @@ reference.

0 means no differences.

+
+--quiet +
+
+

+ Disable all output of the program. Implies --exit-code. +

+

For more detailed explanation on these common options, see also diffcore documentation.

@@ -869,7 +877,7 @@ git-format-patch -3 diff --git a/git.html b/git.html index d57fd4f8c..871e4448f 100644 --- a/git.html +++ b/git.html @@ -2317,7 +2317,7 @@ contributors on the git-list <git@vger.kernel.org>.

-- 2.26.2