From: Junio C Hamano Date: Tue, 28 Nov 2006 02:22:25 +0000 (+0000) Subject: Autogenerated HTML docs for v1.4.4.1-gf0df X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1c437129d10b93b90ff0df7bc5086df4aa0f6024;p=git.git Autogenerated HTML docs for v1.4.4.1-gf0df --- diff --git a/diff-format.txt b/diff-format.txt index e4520e28e..883c1bb0a 100644 --- a/diff-format.txt +++ b/diff-format.txt @@ -65,62 +65,17 @@ Generating patches with -p When "git-diff-index", "git-diff-tree", or "git-diff-files" are run with a '-p' option, they do not produce the output described above; -instead they produce a patch file. +instead they produce a patch file. You can customize the creation +of such patches via the GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS +environment variables. -The patch generation can be customized at two levels. - -1. When the environment variable 'GIT_EXTERNAL_DIFF' is not set, - these commands internally invoke "diff" like this: - - diff -L a/ -L b/ -pu -+ -For added files, `/dev/null` is used for . For removed -files, `/dev/null` is used for -+ -The "diff" formatting options can be customized via the -environment variable 'GIT_DIFF_OPTS'. For example, if you -prefer context diff: - - GIT_DIFF_OPTS=-c git-diff-index -p HEAD - - -2. When the environment variable 'GIT_EXTERNAL_DIFF' is set, the - program named by it is called, instead of the diff invocation - described above. -+ -For a path that is added, removed, or modified, -'GIT_EXTERNAL_DIFF' is called with 7 parameters: - - path old-file old-hex old-mode new-file new-hex new-mode -+ -where: - - -file:: are files GIT_EXTERNAL_DIFF can use to read the - contents of , - -hex:: are the 40-hexdigit SHA1 hashes, - -mode:: are the octal representation of the file modes. - -+ -The file parameters can point at the user's working file -(e.g. `new-file` in "git-diff-files"), `/dev/null` (e.g. `old-file` -when a new file is added), or a temporary file (e.g. `old-file` in the -index). 'GIT_EXTERNAL_DIFF' should not worry about unlinking the -temporary file --- it is removed when 'GIT_EXTERNAL_DIFF' exits. - -For a path that is unmerged, 'GIT_EXTERNAL_DIFF' is called with 1 -parameter, . - - -git specific extension to diff format -------------------------------------- - -What -p option produces is slightly different from the -traditional diff format. +What the -p option produces is slightly different from the traditional +diff format. 1. It is preceded with a "git diff" header, that looks like this: - diff --git a/file1 b/file2 + diff --git a/file1 b/file2 + The `a/` and `b/` filenames are the same unless rename/copy is involved. Especially, even for a creation or a deletion, diff --git a/git-diff-files.html b/git-diff-files.html index e00a44e65..8d724d79a 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -751,82 +751,11 @@ respectively.

When "git-diff-index", "git-diff-tree", or "git-diff-files" are run with a -p option, they do not produce the output described above; -instead they produce a patch file.

-

The patch generation can be customized at two levels.

-
    -
  1. -

    -When the environment variable GIT_EXTERNAL_DIFF is not set, - these commands internally invoke "diff" like this: -

    -
    -
    -
    diff -L a/<path> -L b/<path> -pu <old> <new>
    -
    -

    For added files, /dev/null is used for <old>. For removed -files, /dev/null is used for <new>

    -

    The "diff" formatting options can be customized via the -environment variable GIT_DIFF_OPTS. For example, if you -prefer context diff:

    -
    -
    -
    GIT_DIFF_OPTS=-c git-diff-index -p HEAD
    -
    -
    2. -
  2. -

    -When the environment variable GIT_EXTERNAL_DIFF is set, the - program named by it is called, instead of the diff invocation - described above. -

    -

    For a path that is added, removed, or modified, -GIT_EXTERNAL_DIFF is called with 7 parameters:

    -
    -
    -
    path old-file old-hex old-mode new-file new-hex new-mode
    -
    -

    where:

    -
    - - - - - - - - - - - - -
    -<old|new>-file - -are files GIT_EXTERNAL_DIFF can use to read the - contents of <old|new>, -
    -<old|new>-hex - -are the 40-hexdigit SHA1 hashes, -
    -<old|new>-mode - -are the octal representation of the file modes. -
    -

    The file parameters can point at the user's working file -(e.g. new-file in "git-diff-files"), /dev/null (e.g. old-file -when a new file is added), or a temporary file (e.g. old-file in the -index). GIT_EXTERNAL_DIFF should not worry about unlinking the -temporary file --- it is removed when GIT_EXTERNAL_DIFF exits.

    -
    3. -
-

For a path that is unmerged, GIT_EXTERNAL_DIFF is called with 1 -parameter, <path>.

-
-

git specific extension to diff format

-
-

What -p option produces is slightly different from the -traditional diff format.

+instead they produce a patch file. You can customize the creation +of such patches via the GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS +environment variables.

+

What the -p option produces is slightly different from the traditional +diff format.

  1. @@ -1009,7 +938,7 @@ two unresolved merge parents with the working tree file

diff --git a/git-diff-index.html b/git-diff-index.html index b7581bbc0..8a39f877b 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -747,82 +747,11 @@ respectively.

When "git-diff-index", "git-diff-tree", or "git-diff-files" are run with a -p option, they do not produce the output described above; -instead they produce a patch file.

-

The patch generation can be customized at two levels.

-
    -
  1. -

    -When the environment variable GIT_EXTERNAL_DIFF is not set, - these commands internally invoke "diff" like this: -

    -
    -
    -
    diff -L a/<path> -L b/<path> -pu <old> <new>
    -
    -

    For added files, /dev/null is used for <old>. For removed -files, /dev/null is used for <new>

    -

    The "diff" formatting options can be customized via the -environment variable GIT_DIFF_OPTS. For example, if you -prefer context diff:

    -
    -
    -
    GIT_DIFF_OPTS=-c git-diff-index -p HEAD
    -
    -
    2. -
  2. -

    -When the environment variable GIT_EXTERNAL_DIFF is set, the - program named by it is called, instead of the diff invocation - described above. -

    -

    For a path that is added, removed, or modified, -GIT_EXTERNAL_DIFF is called with 7 parameters:

    -
    -
    -
    path old-file old-hex old-mode new-file new-hex new-mode
    -
    -

    where:

    -
    - - - - - - - - - - - - -
    -<old|new>-file - -are files GIT_EXTERNAL_DIFF can use to read the - contents of <old|new>, -
    -<old|new>-hex - -are the 40-hexdigit SHA1 hashes, -
    -<old|new>-mode - -are the octal representation of the file modes. -
    -

    The file parameters can point at the user's working file -(e.g. new-file in "git-diff-files"), /dev/null (e.g. old-file -when a new file is added), or a temporary file (e.g. old-file in the -index). GIT_EXTERNAL_DIFF should not worry about unlinking the -temporary file --- it is removed when GIT_EXTERNAL_DIFF exits.

    -
    3. -
-

For a path that is unmerged, GIT_EXTERNAL_DIFF is called with 1 -parameter, <path>.

-
-

git specific extension to diff format

-
-

What -p option produces is slightly different from the -traditional diff format.

+instead they produce a patch file. You can customize the creation +of such patches via the GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS +environment variables.

+

What the -p option produces is slightly different from the traditional +diff format.

  1. @@ -1099,7 +1028,7 @@ always have the special all-zero sha1.

diff --git a/git-diff-stages.html b/git-diff-stages.html index 0bf670f85..8ecb54099 100644 --- a/git-diff-stages.html +++ b/git-diff-stages.html @@ -725,82 +725,11 @@ respectively.

When "git-diff-index", "git-diff-tree", or "git-diff-files" are run with a -p option, they do not produce the output described above; -instead they produce a patch file.

-

The patch generation can be customized at two levels.

-
    -
  1. -

    -When the environment variable GIT_EXTERNAL_DIFF is not set, - these commands internally invoke "diff" like this: -

    -
    -
    -
    diff -L a/<path> -L b/<path> -pu <old> <new>
    -
    -

    For added files, /dev/null is used for <old>. For removed -files, /dev/null is used for <new>

    -

    The "diff" formatting options can be customized via the -environment variable GIT_DIFF_OPTS. For example, if you -prefer context diff:

    -
    -
    -
    GIT_DIFF_OPTS=-c git-diff-index -p HEAD
    -
    -
    2. -
  2. -

    -When the environment variable GIT_EXTERNAL_DIFF is set, the - program named by it is called, instead of the diff invocation - described above. -

    -

    For a path that is added, removed, or modified, -GIT_EXTERNAL_DIFF is called with 7 parameters:

    -
    -
    -
    path old-file old-hex old-mode new-file new-hex new-mode
    -
    -

    where:

    -
    - - - - - - - - - - - - -
    -<old|new>-file - -are files GIT_EXTERNAL_DIFF can use to read the - contents of <old|new>, -
    -<old|new>-hex - -are the 40-hexdigit SHA1 hashes, -
    -<old|new>-mode - -are the octal representation of the file modes. -
    -

    The file parameters can point at the user's working file -(e.g. new-file in "git-diff-files"), /dev/null (e.g. old-file -when a new file is added), or a temporary file (e.g. old-file in the -index). GIT_EXTERNAL_DIFF should not worry about unlinking the -temporary file --- it is removed when GIT_EXTERNAL_DIFF exits.

    -
    3. -
-

For a path that is unmerged, GIT_EXTERNAL_DIFF is called with 1 -parameter, <path>.

-
-

git specific extension to diff format

-
-

What -p option produces is slightly different from the -traditional diff format.

+instead they produce a patch file. You can customize the creation +of such patches via the GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS +environment variables.

+

What the -p option produces is slightly different from the traditional +diff format.

  1. @@ -983,7 +912,7 @@ two unresolved merge parents with the working tree file

diff --git a/git-diff-tree.html b/git-diff-tree.html index dc0622866..f330ff65b 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -1033,82 +1033,11 @@ respectively.

When "git-diff-index", "git-diff-tree", or "git-diff-files" are run with a -p option, they do not produce the output described above; -instead they produce a patch file.

-

The patch generation can be customized at two levels.

-
    -
  1. -

    -When the environment variable GIT_EXTERNAL_DIFF is not set, - these commands internally invoke "diff" like this: -

    -
    -
    -
    diff -L a/<path> -L b/<path> -pu <old> <new>
    -
    -

    For added files, /dev/null is used for <old>. For removed -files, /dev/null is used for <new>

    -

    The "diff" formatting options can be customized via the -environment variable GIT_DIFF_OPTS. For example, if you -prefer context diff:

    -
    -
    -
    GIT_DIFF_OPTS=-c git-diff-index -p HEAD
    -
    -
    2. -
  2. -

    -When the environment variable GIT_EXTERNAL_DIFF is set, the - program named by it is called, instead of the diff invocation - described above. -

    -

    For a path that is added, removed, or modified, -GIT_EXTERNAL_DIFF is called with 7 parameters:

    -
    -
    -
    path old-file old-hex old-mode new-file new-hex new-mode
    -
    -

    where:

    -
    - - - - - - - - - - - - -
    -<old|new>-file - -are files GIT_EXTERNAL_DIFF can use to read the - contents of <old|new>, -
    -<old|new>-hex - -are the 40-hexdigit SHA1 hashes, -
    -<old|new>-mode - -are the octal representation of the file modes. -
    -

    The file parameters can point at the user's working file -(e.g. new-file in "git-diff-files"), /dev/null (e.g. old-file -when a new file is added), or a temporary file (e.g. old-file in the -index). GIT_EXTERNAL_DIFF should not worry about unlinking the -temporary file --- it is removed when GIT_EXTERNAL_DIFF exits.

    -
    3. -
-

For a path that is unmerged, GIT_EXTERNAL_DIFF is called with 1 -parameter, <path>.

-
-

git specific extension to diff format

-
-

What -p option produces is slightly different from the -traditional diff format.

+instead they produce a patch file. You can customize the creation +of such patches via the GIT_EXTERNAL_DIFF and the GIT_DIFF_OPTS +environment variables.

+

What the -p option produces is slightly different from the traditional +diff format.

  1. @@ -1291,7 +1220,7 @@ two unresolved merge parents with the working tree file

diff --git a/git.html b/git.html index 7e2f436f4..09ada9751 100644 --- a/git.html +++ b/git.html @@ -1617,16 +1617,63 @@ git so take care if using Cogito etc.

GIT_DIFF_OPTS
+
+

+ Only valid setting is "--unified=??" or "-u??" to set the + number of context lines shown when a unified diff is created. + This takes precedence over any "-U" or "--unified" option + value passed on the git diff command line. +

+
GIT_EXTERNAL_DIFF

- see the "generating patches" section in : - git-diff-index(1); - git-diff-files(1); - git-diff-tree(1) + When the environment variable GIT_EXTERNAL_DIFF is set, the + program named by it is called, instead of the diff invocation + described above. For a path that is added, removed, or modified, + GIT_EXTERNAL_DIFF is called with 7 parameters:

+
+
+
path old-file old-hex old-mode new-file new-hex new-mode
+
+

where:

+
+ + + + + + + + + + + + +
+<old|new>-file + +are files GIT_EXTERNAL_DIFF can use to read the + contents of <old|new>, +
+<old|new>-hex + +are the 40-hexdigit SHA1 hashes, +
+<old|new>-mode + +are the octal representation of the file modes. +
+

The file parameters can point at the user's working file +(e.g. new-file in "git-diff-files"), /dev/null (e.g. old-file +when a new file is added), or a temporary file (e.g. old-file in the +index). GIT_EXTERNAL_DIFF should not worry about unlinking the +temporary file --- it is removed when GIT_EXTERNAL_DIFF exits.

+

For a path that is unmerged, GIT_EXTERNAL_DIFF is called with 1 +parameter, <path>.

other

@@ -2214,7 +2261,7 @@ contributors on the git-list <git@vger.kernel.org>.

diff --git a/git.txt b/git.txt index 619d65685..6382ef0a0 100644 --- a/git.txt +++ b/git.txt @@ -639,11 +639,35 @@ git Commits git Diffs ~~~~~~~~~ 'GIT_DIFF_OPTS':: + Only valid setting is "--unified=??" or "-u??" to set the + number of context lines shown when a unified diff is created. + This takes precedence over any "-U" or "--unified" option + value passed on the git diff command line. + 'GIT_EXTERNAL_DIFF':: - see the "generating patches" section in : - gitlink:git-diff-index[1]; - gitlink:git-diff-files[1]; - gitlink:git-diff-tree[1] + When the environment variable 'GIT_EXTERNAL_DIFF' is set, the + program named by it is called, instead of the diff invocation + described above. For a path that is added, removed, or modified, + 'GIT_EXTERNAL_DIFF' is called with 7 parameters: + + path old-file old-hex old-mode new-file new-hex new-mode ++ +where: + + -file:: are files GIT_EXTERNAL_DIFF can use to read the + contents of , + -hex:: are the 40-hexdigit SHA1 hashes, + -mode:: are the octal representation of the file modes. + ++ +The file parameters can point at the user's working file +(e.g. `new-file` in "git-diff-files"), `/dev/null` (e.g. `old-file` +when a new file is added), or a temporary file (e.g. `old-file` in the +index). 'GIT_EXTERNAL_DIFF' should not worry about unlinking the +temporary file --- it is removed when 'GIT_EXTERNAL_DIFF' exits. ++ +For a path that is unmerged, 'GIT_EXTERNAL_DIFF' is called with 1 +parameter, . other ~~~~~