From 6936156b92bf31acd8e14b74ddf5b83a59de50f6 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 26 Jul 2007 02:14:34 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.3-rc3-7-gd58e --- diff-options.txt | 7 +++++++ git-diff-files.html | 19 ++++++++++++++++++- git-diff-index.html | 19 ++++++++++++++++++- git-diff-tree.html | 19 ++++++++++++++++++- git-diff.html | 19 ++++++++++++++++++- git-format-patch.html | 19 ++++++++++++++++++- 6 files changed, 97 insertions(+), 5 deletions(-) diff --git a/diff-options.txt b/diff-options.txt index 3d2b9d0a0..82165763b 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -4,6 +4,13 @@ -u:: Synonym for "-p". +-U:: + Shorthand for "--unified=". + +--unified=:: + Generate diffs with lines of context instead of + the usual three. Implies "-p". + --raw:: Generate the raw format. diff --git a/git-diff-files.html b/git-diff-files.html index f12d5e37d..c5e961c0b 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -301,6 +301,23 @@ same as "git-diff-index" and "git-diff-tree".

+-U<n> +
+
+

+ Shorthand for "--unified=<n>". +

+
+
+--unified=<n> +
+
+

+ Generate diffs with <n> lines of context instead of + the usual three. Implies "-p". +

+
+
--raw
@@ -1094,7 +1111,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff-index.html b/git-diff-index.html index 073ac418d..4f858471d 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -302,6 +302,23 @@ entries in the index are compared.

+-U<n> +
+
+

+ Shorthand for "--unified=<n>". +

+
+
+--unified=<n> +
+
+

+ Generate diffs with <n> lines of context instead of + the usual three. Implies "-p". +

+
+
--raw
@@ -1176,7 +1193,7 @@ always have the special all-zero sha1. diff --git a/git-diff-tree.html b/git-diff-tree.html index bd505f816..afeeab55c 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -304,6 +304,23 @@ git-diff-tree(1) Manual Page

+-U<n> +
+
+

+ Shorthand for "--unified=<n>". +

+
+
+--unified=<n> +
+
+

+ Generate diffs with <n> lines of context instead of + the usual three. Implies "-p". +

+
+
--raw
@@ -1564,7 +1581,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff.html b/git-diff.html index a0fb76d93..0fb9d85f3 100644 --- a/git-diff.html +++ b/git-diff.html @@ -356,6 +356,23 @@ any <tree-ish>.

+-U<n> +
+
+

+ Shorthand for "--unified=<n>". +

+
+
+--unified=<n> +
+
+

+ Generate diffs with <n> lines of context instead of + the usual three. Implies "-p". +

+
+
--raw
@@ -879,7 +896,7 @@ output diff in reverse. diff --git a/git-format-patch.html b/git-format-patch.html index 3c1f49456..ac39fd689 100644 --- a/git-format-patch.html +++ b/git-format-patch.html @@ -327,6 +327,23 @@ reference.

+-U<n> +
+
+

+ Shorthand for "--unified=<n>". +

+
+
+--unified=<n> +
+
+

+ Generate diffs with <n> lines of context instead of + the usual three. Implies "-p". +

+
+
--raw
@@ -930,7 +947,7 @@ git-format-patch -3 -- 2.26.2