From: Junio C Hamano Date: Fri, 13 Jul 2007 05:33:25 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.3-rc1-4-gaf83 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1e6e00634f257c354c4261ef7da2b8dc495e3c99;p=git.git Autogenerated HTML docs for v1.5.3-rc1-4-gaf83 --- diff --git a/config.txt b/config.txt index 11b332117..d0e9a175f 100644 --- a/config.txt +++ b/config.txt @@ -567,6 +567,7 @@ merge.verbosity:: message if conflicts were detected. Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level 5 and above outputs debugging information. The default is level 2. + Can be overriden by 'GIT_MERGE_VERBOSITY' environment variable. merge..name:: Defines a human readable name for a custom low-level diff --git a/git-clone.html b/git-clone.html index 4c1dcde1d..e243475d7 100644 --- a/git-clone.html +++ b/git-clone.html @@ -352,6 +352,9 @@ configuration variables.

+--no-checkout +
+
-n
@@ -608,7 +611,7 @@ Create a repository on the kernel.org machine that borrows from Linus diff --git a/git-clone.txt b/git-clone.txt index 2f39864b8..a0a10e3e2 100644 --- a/git-clone.txt +++ b/git-clone.txt @@ -64,6 +64,7 @@ OPTIONS Operate quietly. This flag is passed to "rsync" and "git-fetch-pack" commands when given. +--no-checkout:: -n:: No checkout of HEAD is performed after the clone is complete. diff --git a/git-commit.html b/git-commit.html index 7c1b54e07..d5303b9f8 100644 --- a/git-commit.html +++ b/git-commit.html @@ -273,7 +273,7 @@ git-commit(1) Manual Page

SYNOPSIS

-
git-commit [-a | --interactive] [-s] [-v] +
git-commit [-a | --interactive] [-s] [-v] [-u] [(-c | -C) <commit> | -F <file> | -m <msg> | --amend] [--no-verify] [-e] [--author <author>] [--] [[-i | -o ]<file>…]
@@ -372,7 +372,7 @@ that, you can recover from it with git-reset(1).

--m <msg> +-m <msg>|--message=<msg>

@@ -443,6 +443,29 @@ that, you can recover from it with git-reset(1).

+-u|--untracked-files +
+
+

+ Show all untracked files, also those in uninteresting + directories, in the "Untracked files:" section of commit + message template. Without this option only its name and + a trailing slash are displayed for each untracked + directory. +

+
+
+-v|--verbose +
+
+

+ Show unified diff between the HEAD commit and what + would be committed at the bottom of the commit message + template. Note that this diff output doesn't have its + lines prefixed with #. +

+
+
-q|--quiet
@@ -664,7 +687,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-commit.txt b/git-commit.txt index 53a7bb089..f96142f96 100644 --- a/git-commit.txt +++ b/git-commit.txt @@ -8,7 +8,7 @@ git-commit - Record changes to the repository SYNOPSIS -------- [verse] -'git-commit' [-a | --interactive] [-s] [-v] +'git-commit' [-a | --interactive] [-s] [-v] [-u] [(-c | -C) | -F | -m | --amend] [--no-verify] [-e] [--author ] [--] [[-i | -o ]...] @@ -71,7 +71,7 @@ OPTIONS Override the author name used in the commit. Use `A U Thor ` format. --m :: +-m |--message=:: Use the given as the commit message. -s|--signoff:: @@ -115,6 +115,19 @@ but can be used to amend a merge commit. as well. This is usually not what you want unless you are concluding a conflicted merge. +-u|--untracked-files:: + Show all untracked files, also those in uninteresting + directories, in the "Untracked files:" section of commit + message template. Without this option only its name and + a trailing slash are displayed for each untracked + directory. + +-v|--verbose:: + Show unified diff between the HEAD commit and what + would be committed at the bottom of the commit message + template. Note that this diff output doesn't have its + lines prefixed with '#'. + -q|--quiet:: Suppress commit summary message. diff --git a/git-config.html b/git-config.html index cd9c45495..3dc4d8754 100644 --- a/git-config.html +++ b/git-config.html @@ -1528,6 +1528,7 @@ merge.verbosity message if conflicts were detected. Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level 5 and above outputs debugging information. The default is level 2. + Can be overriden by GIT_MERGE_VERBOSITY environment variable.

@@ -1850,7 +1851,7 @@ transfer.unpackLimit diff --git a/git-merge.html b/git-merge.html index 9f4fa0b0a..d42cf1676 100644 --- a/git-merge.html +++ b/git-merge.html @@ -429,6 +429,33 @@ ours would want to start over, you can recover with git-reset(1).

+

CONFIGURATION

+
+
+
+merge.summary +
+
+

+ Whether to include summaries of merged commits in newly + created merge commit. False by default. +

+
+
+merge.verbosity +
+
+

+ Controls the amount of output shown by the recursive merge + strategy. Level 0 outputs nothing except a final error + message if conflicts were detected. Level 1 outputs only + conflicts, 2 outputs conflicts and file changes. Level 5 and + above outputs debugging information. The default is level 2. + Can be overriden by GIT_MERGE_VERBOSITY environment variable. +

+
+
+

HOW MERGE WORKS

A merge is always between the current HEAD and one or more @@ -579,7 +606,7 @@ Resolve the conflicts. git-diff would report only the

diff --git a/git-merge.txt b/git-merge.txt index d285cba03..2c9db98a3 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -43,6 +43,21 @@ If you tried a merge which resulted in a complex conflicts and would want to start over, you can recover with gitlink:git-reset[1]. +CONFIGURATION +------------- + +merge.summary:: + Whether to include summaries of merged commits in newly + created merge commit. False by default. + +merge.verbosity:: + Controls the amount of output shown by the recursive merge + strategy. Level 0 outputs nothing except a final error + message if conflicts were detected. Level 1 outputs only + conflicts, 2 outputs conflicts and file changes. Level 5 and + above outputs debugging information. The default is level 2. + Can be overriden by 'GIT_MERGE_VERBOSITY' environment variable. + HOW MERGE WORKS --------------- diff --git a/git.html b/git.html index 12d19397b..210a6ae9e 100644 --- a/git.html +++ b/git.html @@ -1799,6 +1799,16 @@ parameter, <path>.

other

+GIT_MERGE_VERBOSITY +
+
+

+ A number controlling the amount of output shown by + the recursive merge strategy. Overrides merge.verbosity. + See git-merge(1) +

+
+
GIT_PAGER
@@ -2398,7 +2408,7 @@ contributors on the git-list <git@vger.kernel.org>.

diff --git a/git.txt b/git.txt index 33614ec05..3fbfd45ff 100644 --- a/git.txt +++ b/git.txt @@ -411,6 +411,11 @@ parameter, . other ~~~~~ +'GIT_MERGE_VERBOSITY':: + A number controlling the amount of output shown by + the recursive merge strategy. Overrides merge.verbosity. + See gitlink:git-merge[1] + 'GIT_PAGER':: This environment variable overrides `$PAGER`.