From: Junio C Hamano Date: Fri, 27 Jul 2007 07:26:40 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.3-rc3-13-g7ab3 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b968dbbd6a939fc1282a7837026e131ed921e122;p=git.git Autogenerated HTML docs for v1.5.3-rc3-13-g7ab3 --- diff --git a/config.txt b/config.txt index dd98d95d9..3135cb7a6 100644 --- a/config.txt +++ b/config.txt @@ -393,6 +393,9 @@ color.status.:: or `untracked` (files which are not tracked by git). The values of these variables may be specified as in color.branch.. +commit.template:: + Specify a file to use as the template for new commit messages. + diff.renameLimit:: The number of files to consider when performing the copy/rename detection; equivalent to the git diff option '-l'. diff --git a/diff-options.txt b/diff-options.txt index 82165763b..228ccaf10 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -43,7 +43,9 @@ Synonym for "-p --stat". -z:: - \0 line termination on output + NUL-line termination on output. This affects the --raw + output field terminator. Also output from commands such + as "git-log" will be delimited with NUL between commits. --name-only:: Show only names of changed files. diff --git a/git-commit.html b/git-commit.html index af283396a..500db14ab 100644 --- a/git-commit.html +++ b/git-commit.html @@ -387,9 +387,8 @@ that, you can recover from it with git-reset(1).

-m or -F options, this option has no effect. The - template file may also be specified using the commit.template - configuration variable. + the -m or -F options, this option has no effect. This + overrides the commit.template configuration variable.

@@ -702,7 +701,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-commit.txt b/git-commit.txt index 3f36c6782..627994eb9 100644 --- a/git-commit.txt +++ b/git-commit.txt @@ -78,9 +78,8 @@ OPTIONS Use the contents of the given file as the initial version of the commit message. The editor is invoked and you can make subsequent changes. If a message is specified using - the `-m` or `-F` options, this option has no effect. The - template file may also be specified using the `commit.template` - configuration variable. + the `-m` or `-F` options, this option has no effect. This + overrides the `commit.template` configuration variable. -s|--signoff:: Add Signed-off-by line at the end of the commit message. diff --git a/git-config.html b/git-config.html index 078501e9b..49295b7de 100644 --- a/git-config.html +++ b/git-config.html @@ -1200,6 +1200,14 @@ color.status.<slot>

+commit.template +
+
+

+ Specify a file to use as the template for new commit messages. +

+
+
diff.renameLimit
@@ -1864,7 +1872,7 @@ transfer.unpackLimit diff --git a/git-diff-files.html b/git-diff-files.html index c5e961c0b..f80a5a231 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -388,7 +388,9 @@ same as "git-diff-index" and "git-diff-tree".

- \0 line termination on output + NUL-line termination on output. This affects the --raw + output field terminator. Also output from commands such + as "git-log" will be delimited with NUL between commits.

@@ -1111,7 +1113,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff-index.html b/git-diff-index.html index 4f858471d..9d6dc39e6 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -389,7 +389,9 @@ entries in the index are compared.

- \0 line termination on output + NUL-line termination on output. This affects the --raw + output field terminator. Also output from commands such + as "git-log" will be delimited with NUL between commits.

@@ -1193,7 +1195,7 @@ always have the special all-zero sha1. diff --git a/git-diff-tree.html b/git-diff-tree.html index afeeab55c..b45da3655 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -391,7 +391,9 @@ git-diff-tree(1) Manual Page

- \0 line termination on output + NUL-line termination on output. This affects the --raw + output field terminator. Also output from commands such + as "git-log" will be delimited with NUL between commits.

@@ -1581,7 +1583,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff.html b/git-diff.html index 0fb9d85f3..8dc5c68ad 100644 --- a/git-diff.html +++ b/git-diff.html @@ -443,7 +443,9 @@ any <tree-ish>.

- \0 line termination on output + NUL-line termination on output. This affects the --raw + output field terminator. Also output from commands such + as "git-log" will be delimited with NUL between commits.

@@ -896,7 +898,7 @@ output diff in reverse. diff --git a/git-format-patch.html b/git-format-patch.html index ac39fd689..eb04f9013 100644 --- a/git-format-patch.html +++ b/git-format-patch.html @@ -414,7 +414,9 @@ reference.

- \0 line termination on output + NUL-line termination on output. This affects the --raw + output field terminator. Also output from commands such + as "git-log" will be delimited with NUL between commits.

@@ -947,7 +949,7 @@ git-format-patch -3