From: Junio C Hamano Date: Wed, 12 Dec 2007 21:34:02 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.3.7-1170-g8d08 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3a70234ac18c2126eeef7a31f798af975301194c;p=git.git Autogenerated HTML docs for v1.5.3.7-1170-g8d08 --- diff --git a/diff-format.txt b/diff-format.txt index 2c3a4c433..400cbb3b1 100644 --- a/diff-format.txt +++ b/diff-format.txt @@ -84,3 +84,64 @@ all parents. include::diff-generate-patch.txt[] + + +other diff formats +------------------ + +The `--summary` option describes newly added, deleted, renamed and +copied files. The `--stat` option adds diffstat(1) graph to the +output. These options can be combined with other options, such as +`-p`, and are meant for human consumption. + +When showing a change that involves a rename or a copy, `--stat` output +formats the pathnames compactly by combining common prefix and suffix of +the pathnames. For example, a change that moves `arch/i386/Makefile` to +`arch/x86/Makefile` while modifying 4 lines will be shown like this: + +------------------------------------ +arch/{i386 => x86}/Makefile | 4 +-- +------------------------------------ + +The `--numstat` option gives the diffstat(1) information but is designed +for easier machine consumption. An entry in `--numstat` output looks +like this: + +---------------------------------------- +1 2 README +3 1 arch/{i386 => x86}/Makefile +---------------------------------------- + +That is, from left to right: + +. the number of added lines; +. a tab; +. the number of deleted lines; +. a tab; +. pathname (possibly with rename/copy information); +. a newline. + +When `-z` output option is in effect, the output is formatted this way: + +---------------------------------------- +1 2 README NUL +3 1 NUL arch/i386/Makefile NUL arch/x86/Makefile NUL +---------------------------------------- + +That is: + +. the number of added lines; +. a tab; +. the number of deleted lines; +. a tab; +. a NUL (only exists if renamed/copied); +. pathname in preimage; +. a NUL (only exists if renamed/copied); +. pathname in postimage (only exists if renamed/copied); +. a NUL. + +The extra `NUL` before the preimage path in renamed case is to allow +scripts that read the output to tell if the current record being read is +a single-path record or a rename/copy record without reading ahead. +After reading added and deleted lines, reading up to `NUL` would yield +the pathname, but if that is `NUL`, the record will show two paths. diff --git a/diff-options.txt b/diff-options.txt index d0154bbc0..5d22b7b58 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -175,19 +175,19 @@ endif::git-format-patch[] Shorthand for "--text". --ignore-space-at-eol:: - Ignore changes in white spaces at EOL. + Ignore changes in whitespace at EOL. --ignore-space-change:: - Ignore changes in amount of white space. This ignores white - space at line end, and consider all other sequences of one or - more white space characters to be equivalent. + Ignore changes in amount of whitespace. This ignores whitespace + at line end, and considers all other sequences of one or + more whitespace characters to be equivalent. -b:: Shorthand for "--ignore-space-change". --ignore-all-space:: - Ignore white space when comparing lines. This ignores - difference even if one line has white space where the other + Ignore whitespace when comparing lines. This ignores + differences even if one line has whitespace where the other line has none. -w:: diff --git a/git-apply.html b/git-apply.html index 5bea98553..b6d6d7fcd 100644 --- a/git-apply.html +++ b/git-apply.html @@ -461,7 +461,7 @@ discouraged.

When applying a patch, ignore additions made by the - patch. This can be used to extract common part between + patch. This can be used to extract the common part between two files by first running diff on them and applying the result with this option, which would apply the deletion part but not addition part. @@ -604,7 +604,7 @@ subdirectory is checked and (if possible) updated.

diff --git a/git-apply.txt b/git-apply.txt index bae3e7b90..9ec38f92b 100644 --- a/git-apply.txt +++ b/git-apply.txt @@ -119,7 +119,7 @@ discouraged. --no-add:: When applying a patch, ignore additions made by the - patch. This can be used to extract common part between + patch. This can be used to extract the common part between two files by first running `diff` on them and applying the result with this option, which would apply the deletion part but not addition part. diff --git a/git-diff-files.html b/git-diff-files.html index 9931e6223..8662cceaf 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -619,7 +619,7 @@ same as "git-diff-index" and "git-diff-tree".

- Ignore changes in white spaces at EOL. + Ignore changes in whitespace at EOL.

@@ -627,9 +627,9 @@ same as "git-diff-index" and "git-diff-tree".

- Ignore changes in amount of white space. This ignores white - space at line end, and consider all other sequences of one or - more white space characters to be equivalent. + Ignore changes in amount of whitespace. This ignores whitespace + at line end, and considers all other sequences of one or + more whitespace characters to be equivalent.

@@ -645,8 +645,8 @@ same as "git-diff-index" and "git-diff-tree".

- Ignore white space when comparing lines. This ignores - difference even if one line has white space where the other + Ignore whitespace when comparing lines. This ignores + differences even if one line has whitespace where the other line has none.

@@ -1106,6 +1106,121 @@ two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka "their version").

+

other diff formats

+
+

The --summary option describes newly added, deleted, renamed and +copied files. The --stat option adds diffstat(1) graph to the +output. These options can be combined with other options, such as +-p, and are meant for human consumption.

+

When showing a change that involves a rename or a copy, --stat output +formats the pathnames compactly by combining common prefix and suffix of +the pathnames. For example, a change that moves arch/i386/Makefile to +arch/x86/Makefile while modifying 4 lines will be shown like this:

+
+
+
arch/{i386 => x86}/Makefile    |   4 +--
+
+

The --numstat option gives the diffstat(1) information but is designed +for easier machine consumption. An entry in --numstat output looks +like this:

+
+
+
1       2       README
+3       1       arch/{i386 => x86}/Makefile
+
+

That is, from left to right:

+
    +
  1. +

    +the number of added lines; +

    +
    2. +
  2. +

    +a tab; +

    +
    3. +
  3. +

    +the number of deleted lines; +

    +
    4. +
  4. +

    +a tab; +

    +
    5. +
  5. +

    +pathname (possibly with rename/copy information); +

    +
    6. +
  6. +

    +a newline. +

    +
    7. +
+

When -z output option is in effect, the output is formatted this way:

+
+
+
1       2       README NUL
+3       1       NUL arch/i386/Makefile NUL arch/x86/Makefile NUL
+
+

That is:

+
    +
  1. +

    +the number of added lines; +

    +
    2. +
  2. +

    +a tab; +

    +
    3. +
  3. +

    +the number of deleted lines; +

    +
    4. +
  4. +

    +a tab; +

    +
    5. +
  5. +

    +a NUL (only exists if renamed/copied); +

    +
    6. +
  6. +

    +pathname in preimage; +

    +
    7. +
  7. +

    +a NUL (only exists if renamed/copied); +

    +
    8. +
  8. +

    +pathname in postimage (only exists if renamed/copied); +

    +
    9. +
  9. +

    +a NUL. +

    +
    10. +
+

The extra NUL before the preimage path in renamed case is to allow +scripts that read the output to tell if the current record being read is +a single-path record or a rename/copy record without reading ahead. +After reading added and deleted lines, reading up to NUL would yield +the pathname, but if that is NUL, the record will show two paths.

+

Author

Written by Linus Torvalds <torvalds@osdl.org>

@@ -1120,7 +1235,7 @@ two unresolved merge parents with the working tree file
diff --git a/git-diff-index.html b/git-diff-index.html index 3e139778a..1ed884ea4 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -620,7 +620,7 @@ entries in the index are compared.

- Ignore changes in white spaces at EOL. + Ignore changes in whitespace at EOL.

@@ -628,9 +628,9 @@ entries in the index are compared.

- Ignore changes in amount of white space. This ignores white - space at line end, and consider all other sequences of one or - more white space characters to be equivalent. + Ignore changes in amount of whitespace. This ignores whitespace + at line end, and considers all other sequences of one or + more whitespace characters to be equivalent.

@@ -646,8 +646,8 @@ entries in the index are compared.

- Ignore white space when comparing lines. This ignores - difference even if one line has white space where the other + Ignore whitespace when comparing lines. This ignores + differences even if one line has whitespace where the other line has none.

@@ -1094,6 +1094,121 @@ two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka "their version").

+

other diff formats

+
+

The --summary option describes newly added, deleted, renamed and +copied files. The --stat option adds diffstat(1) graph to the +output. These options can be combined with other options, such as +-p, and are meant for human consumption.

+

When showing a change that involves a rename or a copy, --stat output +formats the pathnames compactly by combining common prefix and suffix of +the pathnames. For example, a change that moves arch/i386/Makefile to +arch/x86/Makefile while modifying 4 lines will be shown like this:

+
+
+
arch/{i386 => x86}/Makefile    |   4 +--
+
+

The --numstat option gives the diffstat(1) information but is designed +for easier machine consumption. An entry in --numstat output looks +like this:

+
+
+
1       2       README
+3       1       arch/{i386 => x86}/Makefile
+
+

That is, from left to right:

+
    +
  1. +

    +the number of added lines; +

    +
    2. +
  2. +

    +a tab; +

    +
    3. +
  3. +

    +the number of deleted lines; +

    +
    4. +
  4. +

    +a tab; +

    +
    5. +
  5. +

    +pathname (possibly with rename/copy information); +

    +
    6. +
  6. +

    +a newline. +

    +
    7. +
+

When -z output option is in effect, the output is formatted this way:

+
+
+
1       2       README NUL
+3       1       NUL arch/i386/Makefile NUL arch/x86/Makefile NUL
+
+

That is:

+
    +
  1. +

    +the number of added lines; +

    +
    2. +
  2. +

    +a tab; +

    +
    3. +
  3. +

    +the number of deleted lines; +

    +
    4. +
  4. +

    +a tab; +

    +
    5. +
  5. +

    +a NUL (only exists if renamed/copied); +

    +
    6. +
  6. +

    +pathname in preimage; +

    +
    7. +
  7. +

    +a NUL (only exists if renamed/copied); +

    +
    8. +
  8. +

    +pathname in postimage (only exists if renamed/copied); +

    +
    9. +
  9. +

    +a NUL. +

    +
    10. +
+

The extra NUL before the preimage path in renamed case is to allow +scripts that read the output to tell if the current record being read is +a single-path record or a rename/copy record without reading ahead. +After reading added and deleted lines, reading up to NUL would yield +the pathname, but if that is NUL, the record will show two paths.

+

Operating Modes

You can choose whether you want to trust the index file entirely @@ -1202,7 +1317,7 @@ always have the special all-zero sha1.

diff --git a/git-diff-tree.html b/git-diff-tree.html index 887133b3c..d0fc7a44d 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -622,7 +622,7 @@ git-diff-tree(1) Manual Page

- Ignore changes in white spaces at EOL. + Ignore changes in whitespace at EOL.

@@ -630,9 +630,9 @@ git-diff-tree(1) Manual Page

- Ignore changes in amount of white space. This ignores white - space at line end, and consider all other sequences of one or - more white space characters to be equivalent. + Ignore changes in amount of whitespace. This ignores whitespace + at line end, and considers all other sequences of one or + more whitespace characters to be equivalent.

@@ -648,8 +648,8 @@ git-diff-tree(1) Manual Page

- Ignore white space when comparing lines. This ignores - difference even if one line has white space where the other + Ignore whitespace when comparing lines. This ignores + differences even if one line has whitespace where the other line has none.

@@ -1576,6 +1576,121 @@ two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka "their version").

+

other diff formats

+
+

The --summary option describes newly added, deleted, renamed and +copied files. The --stat option adds diffstat(1) graph to the +output. These options can be combined with other options, such as +-p, and are meant for human consumption.

+

When showing a change that involves a rename or a copy, --stat output +formats the pathnames compactly by combining common prefix and suffix of +the pathnames. For example, a change that moves arch/i386/Makefile to +arch/x86/Makefile while modifying 4 lines will be shown like this:

+
+
+
arch/{i386 => x86}/Makefile    |   4 +--
+
+

The --numstat option gives the diffstat(1) information but is designed +for easier machine consumption. An entry in --numstat output looks +like this:

+
+
+
1       2       README
+3       1       arch/{i386 => x86}/Makefile
+
+

That is, from left to right:

+
    +
  1. +

    +the number of added lines; +

    +
    2. +
  2. +

    +a tab; +

    +
    3. +
  3. +

    +the number of deleted lines; +

    +
    4. +
  4. +

    +a tab; +

    +
    5. +
  5. +

    +pathname (possibly with rename/copy information); +

    +
    6. +
  6. +

    +a newline. +

    +
    7. +
+

When -z output option is in effect, the output is formatted this way:

+
+
+
1       2       README NUL
+3       1       NUL arch/i386/Makefile NUL arch/x86/Makefile NUL
+
+

That is:

+
    +
  1. +

    +the number of added lines; +

    +
    2. +
  2. +

    +a tab; +

    +
    3. +
  3. +

    +the number of deleted lines; +

    +
    4. +
  4. +

    +a tab; +

    +
    5. +
  5. +

    +a NUL (only exists if renamed/copied); +

    +
    6. +
  6. +

    +pathname in preimage; +

    +
    7. +
  7. +

    +a NUL (only exists if renamed/copied); +

    +
    8. +
  8. +

    +pathname in postimage (only exists if renamed/copied); +

    +
    9. +
  9. +

    +a NUL. +

    +
    10. +
+

The extra NUL before the preimage path in renamed case is to allow +scripts that read the output to tell if the current record being read is +a single-path record or a rename/copy record without reading ahead. +After reading added and deleted lines, reading up to NUL would yield +the pathname, but if that is NUL, the record will show two paths.

+

Author

Written by Linus Torvalds <torvalds@osdl.org>

@@ -1590,7 +1705,7 @@ two unresolved merge parents with the working tree file
diff --git a/git-diff.html b/git-diff.html index 6a16c477d..75a995599 100644 --- a/git-diff.html +++ b/git-diff.html @@ -698,7 +698,7 @@ and the range notations ("<commit>..<commit>" and

- Ignore changes in white spaces at EOL. + Ignore changes in whitespace at EOL.

@@ -706,9 +706,9 @@ and the range notations ("<commit>..<commit>" and

- Ignore changes in amount of white space. This ignores white - space at line end, and consider all other sequences of one or - more white space characters to be equivalent. + Ignore changes in amount of whitespace. This ignores whitespace + at line end, and considers all other sequences of one or + more whitespace characters to be equivalent.

@@ -724,8 +724,8 @@ and the range notations ("<commit>..<commit>" and

- Ignore white space when comparing lines. This ignores - difference even if one line has white space where the other + Ignore whitespace when comparing lines. This ignores + differences even if one line has whitespace where the other line has none.

@@ -1155,6 +1155,121 @@ two unresolved merge parents with the working tree file (i.e. file1 is stage 2 aka "our version", file2 is stage 3 aka "their version").

+

other diff formats

+
+

The --summary option describes newly added, deleted, renamed and +copied files. The --stat option adds diffstat(1) graph to the +output. These options can be combined with other options, such as +-p, and are meant for human consumption.

+

When showing a change that involves a rename or a copy, --stat output +formats the pathnames compactly by combining common prefix and suffix of +the pathnames. For example, a change that moves arch/i386/Makefile to +arch/x86/Makefile while modifying 4 lines will be shown like this:

+
+
+
arch/{i386 => x86}/Makefile    |   4 +--
+
+

The --numstat option gives the diffstat(1) information but is designed +for easier machine consumption. An entry in --numstat output looks +like this:

+
+
+
1       2       README
+3       1       arch/{i386 => x86}/Makefile
+
+

That is, from left to right:

+
    +
  1. +

    +the number of added lines; +

    +
    2. +
  2. +

    +a tab; +

    +
    3. +
  3. +

    +the number of deleted lines; +

    +
    4. +
  4. +

    +a tab; +

    +
    5. +
  5. +

    +pathname (possibly with rename/copy information); +

    +
    6. +
  6. +

    +a newline. +

    +
    7. +
+

When -z output option is in effect, the output is formatted this way:

+
+
+
1       2       README NUL
+3       1       NUL arch/i386/Makefile NUL arch/x86/Makefile NUL
+
+

That is:

+
    +
  1. +

    +the number of added lines; +

    +
    2. +
  2. +

    +a tab; +

    +
    3. +
  3. +

    +the number of deleted lines; +

    +
    4. +
  4. +

    +a tab; +

    +
    5. +
  5. +

    +a NUL (only exists if renamed/copied); +

    +
    6. +
  6. +

    +pathname in preimage; +

    +
    7. +
  7. +

    +a NUL (only exists if renamed/copied); +

    +
    8. +
  8. +

    +pathname in postimage (only exists if renamed/copied); +

    +
    9. +
  9. +

    +a NUL. +

    +
    10. +
+

The extra NUL before the preimage path in renamed case is to allow +scripts that read the output to tell if the current record being read is +a single-path record or a rename/copy record without reading ahead. +After reading added and deleted lines, reading up to NUL would yield +the pathname, but if that is NUL, the record will show two paths.

+

EXAMPLES

@@ -1317,7 +1432,7 @@ Output diff in reverse.
diff --git a/git-format-patch.html b/git-format-patch.html index 889847de5..418908e49 100644 --- a/git-format-patch.html +++ b/git-format-patch.html @@ -666,7 +666,7 @@ reference.

- Ignore changes in white spaces at EOL. + Ignore changes in whitespace at EOL.

@@ -674,9 +674,9 @@ reference.

- Ignore changes in amount of white space. This ignores white - space at line end, and consider all other sequences of one or - more white space characters to be equivalent. + Ignore changes in amount of whitespace. This ignores whitespace + at line end, and considers all other sequences of one or + more whitespace characters to be equivalent.

@@ -692,8 +692,8 @@ reference.

- Ignore white space when comparing lines. This ignores - difference even if one line has white space where the other + Ignore whitespace when comparing lines. This ignores + differences even if one line has whitespace where the other line has none.

@@ -991,7 +991,7 @@ git-format-patch -3 diff --git a/git-log.html b/git-log.html index 98ee2d3d7..f22ae219d 100644 --- a/git-log.html +++ b/git-log.html @@ -659,7 +659,7 @@ people using 80-column terminals.

- Ignore changes in white spaces at EOL. + Ignore changes in whitespace at EOL.

@@ -667,9 +667,9 @@ people using 80-column terminals.

- Ignore changes in amount of white space. This ignores white - space at line end, and consider all other sequences of one or - more white space characters to be equivalent. + Ignore changes in amount of whitespace. This ignores whitespace + at line end, and considers all other sequences of one or + more whitespace characters to be equivalent.

@@ -685,8 +685,8 @@ people using 80-column terminals.

- Ignore white space when comparing lines. This ignores - difference even if one line has white space where the other + Ignore whitespace when comparing lines. This ignores + differences even if one line has whitespace where the other line has none.

@@ -1447,7 +1447,7 @@ reversible operation.

diff --git a/glossary.html b/glossary.html index 768dac737..ba782a9b0 100644 --- a/glossary.html +++ b/glossary.html @@ -698,8 +698,7 @@ This commit is referred to as a "merge commit", or sometimes just a The unique identifier of an object. The hash of the object's contents using the Secure Hash Algorithm 1 and usually represented by the 40 character hexadecimal encoding of - the hash of the object (possibly followed by - a white space). + the hash of the object.

@@ -1080,7 +1079,7 @@ This commit is referred to as a "merge commit", or sometimes just a diff --git a/glossary.txt b/glossary.txt index fc1874424..65f55e4ce 100644 --- a/glossary.txt +++ b/glossary.txt @@ -244,8 +244,7 @@ This commit is referred to as a "merge commit", or sometimes just a The unique identifier of an <>. The <> of the object's contents using the Secure Hash Algorithm 1 and usually represented by the 40 character hexadecimal encoding of - the <> of the object (possibly followed by - a white space). + the <> of the object. [[def_object_type]]object type:: One of the identifiers diff --git a/user-manual.html b/user-manual.html index 0417d839e..ee9594bd1 100644 --- a/user-manual.html +++ b/user-manual.html @@ -2132,8 +2132,7 @@ This commit is referred to as a "merge commit", or sometimes just a The unique identifier of an object. The hash of the object's contents using the Secure Hash Algorithm 1 and usually represented by the 40 character hexadecimal encoding of - the hash of the object (possibly followed by - a white space). + the hash of the object.
object type