From 16f98874ca3e3f42ea299d3dd858f91f0122d50a Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 12 Jun 2007 16:09:14 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.2.1-255-gca6c0 --- diff-options.txt | 7 ++++--- git-cherry.html | 10 +++++++++- git-cherry.txt | 3 +++ git-diff-files.html | 9 +++++---- git-diff-index.html | 9 +++++---- git-diff-tree.html | 9 +++++---- git-diff.html | 9 +++++---- git-format-patch.html | 9 +++++---- git-submodule.html | 18 +++++++++--------- git-submodule.txt | 16 ++++++++-------- 10 files changed, 58 insertions(+), 41 deletions(-) diff --git a/diff-options.txt b/diff-options.txt index b2a05937f..0f07c9c4a 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -86,7 +86,7 @@ Detect renames. -C:: - Detect copies as well as renames. + Detect copies as well as renames. See also `--find-copies-harder`. --diff-filter=[ACDMRTUXB*]:: Select only files that are Added (`A`), Copied (`C`), @@ -100,12 +100,13 @@ that matches other criteria, nothing is selected. --find-copies-harder:: - For performance reasons, by default, -C option finds copies only + For performance reasons, by default, `-C` option finds copies only if the original file of the copy was modified in the same changeset. This flag makes the command inspect unmodified files as candidates for the source of copy. This is a very expensive operation for large - projects, so use it with caution. + projects, so use it with caution. Giving more than one + `-C` option has the same effect. -l:: -M and -C options require O(n^2) processing time where n diff --git a/git-cherry.html b/git-cherry.html index 66032f27b..87962e7ba 100644 --- a/git-cherry.html +++ b/git-cherry.html @@ -332,6 +332,14 @@ than pushing or pulling commits directly.

Working branch; defaults to HEAD.

+
+<limit> +
+
+

+ Do not report commits up to (and including) limit. +

+

Author

@@ -348,7 +356,7 @@ than pushing or pulling commits directly.

diff --git a/git-cherry.txt b/git-cherry.txt index b62c97097..e6943822c 100644 --- a/git-cherry.txt +++ b/git-cherry.txt @@ -53,6 +53,9 @@ OPTIONS :: Working branch; defaults to HEAD. +:: + Do not report commits up to (and including) limit. + Author ------ Written by Junio C Hamano diff --git a/git-diff-files.html b/git-diff-files.html index a1158e33c..79cc56c81 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -486,7 +486,7 @@ same as "git-diff-index" and "git-diff-tree".

- Detect copies as well as renames. + Detect copies as well as renames. See also --find-copies-harder.

@@ -510,12 +510,13 @@ same as "git-diff-index" and "git-diff-tree".

- For performance reasons, by default, -C option finds copies only + For performance reasons, by default, -C option finds copies only if the original file of the copy was modified in the same changeset. This flag makes the command inspect unmodified files as candidates for the source of copy. This is a very expensive operation for large - projects, so use it with caution. + projects, so use it with caution. Giving more than one + -C option has the same effect.

@@ -1069,7 +1070,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff-index.html b/git-diff-index.html index 68a6e75cc..50167c888 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -487,7 +487,7 @@ entries in the index are compared.

- Detect copies as well as renames. + Detect copies as well as renames. See also --find-copies-harder.

@@ -511,12 +511,13 @@ entries in the index are compared.

- For performance reasons, by default, -C option finds copies only + For performance reasons, by default, -C option finds copies only if the original file of the copy was modified in the same changeset. This flag makes the command inspect unmodified files as candidates for the source of copy. This is a very expensive operation for large - projects, so use it with caution. + projects, so use it with caution. Giving more than one + -C option has the same effect.

@@ -1151,7 +1152,7 @@ always have the special all-zero sha1. diff --git a/git-diff-tree.html b/git-diff-tree.html index b5c7479ac..047f4e4fe 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -489,7 +489,7 @@ git-diff-tree(1) Manual Page

- Detect copies as well as renames. + Detect copies as well as renames. See also --find-copies-harder.

@@ -513,12 +513,13 @@ git-diff-tree(1) Manual Page

- For performance reasons, by default, -C option finds copies only + For performance reasons, by default, -C option finds copies only if the original file of the copy was modified in the same changeset. This flag makes the command inspect unmodified files as candidates for the source of copy. This is a very expensive operation for large - projects, so use it with caution. + projects, so use it with caution. Giving more than one + -C option has the same effect.

@@ -1516,7 +1517,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff.html b/git-diff.html index cbd1d850e..45a5aef28 100644 --- a/git-diff.html +++ b/git-diff.html @@ -541,7 +541,7 @@ any <tree-ish>.

- Detect copies as well as renames. + Detect copies as well as renames. See also --find-copies-harder.

@@ -565,12 +565,13 @@ any <tree-ish>.

- For performance reasons, by default, -C option finds copies only + For performance reasons, by default, -C option finds copies only if the original file of the copy was modified in the same changeset. This flag makes the command inspect unmodified files as candidates for the source of copy. This is a very expensive operation for large - projects, so use it with caution. + projects, so use it with caution. Giving more than one + -C option has the same effect.

@@ -860,7 +861,7 @@ output diff in reverse. diff --git a/git-format-patch.html b/git-format-patch.html index 42ab261d5..c5cd6df1f 100644 --- a/git-format-patch.html +++ b/git-format-patch.html @@ -512,7 +512,7 @@ reference.

- Detect copies as well as renames. + Detect copies as well as renames. See also --find-copies-harder.

@@ -536,12 +536,13 @@ reference.

- For performance reasons, by default, -C option finds copies only + For performance reasons, by default, -C option finds copies only if the original file of the copy was modified in the same changeset. This flag makes the command inspect unmodified files as candidates for the source of copy. This is a very expensive operation for large - projects, so use it with caution. + projects, so use it with caution. Giving more than one + -C option has the same effect.

@@ -902,7 +903,7 @@ git-format-patch -3 diff --git a/git-submodule.html b/git-submodule.html index 285e7bc01..0e7357c95 100644 --- a/git-submodule.html +++ b/git-submodule.html @@ -296,10 +296,10 @@ init

- Initialize the submodules, i.e. clone the git repositories specified - in the .gitmodules file and checkout the submodule commits specified - in the index of the containing repository. This will make the - submodules HEAD be detached. + Initialize the submodules, i.e. register in .git/config each submodule + path and url found in .gitmodules. The key used in git/config is + submodule.$path.url. This command does not alter existing information + in .git/config.

@@ -307,9 +307,9 @@ update

- Update the initialized submodules, i.e. checkout the submodule commits - specified in the index of the containing repository. This will make - the submodules HEAD be detached. + Update the registered submodules, i.e. clone missing submodules and + checkout the commit specified in the index of the containing repository. + This will make the submodules HEAD be detached.

@@ -348,7 +348,7 @@ update

FILES

-

When cloning submodules, a .gitmodules file in the top-level directory +

When initializing submodules, a .gitmodules file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as $GIR_DIR/config. The key to each submodule url is "module.$path.url".

@@ -363,7 +363,7 @@ to each submodule url is "module.$path.url".

diff --git a/git-submodule.txt b/git-submodule.txt index cb0424f77..f8fb80f18 100644 --- a/git-submodule.txt +++ b/git-submodule.txt @@ -23,15 +23,15 @@ status:: repository. This command is the default command for git-submodule. init:: - Initialize the submodules, i.e. clone the git repositories specified - in the .gitmodules file and checkout the submodule commits specified - in the index of the containing repository. This will make the - submodules HEAD be detached. + Initialize the submodules, i.e. register in .git/config each submodule + path and url found in .gitmodules. The key used in git/config is + `submodule.$path.url`. This command does not alter existing information + in .git/config. update:: - Update the initialized submodules, i.e. checkout the submodule commits - specified in the index of the containing repository. This will make - the submodules HEAD be detached. + Update the registered submodules, i.e. clone missing submodules and + checkout the commit specified in the index of the containing repository. + This will make the submodules HEAD be detached. OPTIONS @@ -50,7 +50,7 @@ OPTIONS FILES ----- -When cloning submodules, a .gitmodules file in the top-level directory +When initializing submodules, a .gitmodules file in the top-level directory of the containing repository is used to find the url of each submodule. This file should be formatted in the same way as $GIR_DIR/config. The key to each submodule url is "module.$path.url". -- 2.26.2