From c26f5488a78cd9e6bdcc963590ca3a5895877906 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 9 Jul 2006 09:38:14 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.4.1-g88f0d --- diff-options.txt | 6 ++++++ git-diff-files.html | 18 +++++++++++++++++- git-diff-index.html | 18 +++++++++++++++++- git-diff-stages.html | 18 +++++++++++++++++- git-diff-tree.html | 18 +++++++++++++++++- 5 files changed, 74 insertions(+), 4 deletions(-) diff --git a/diff-options.txt b/diff-options.txt index f523ec2fb..1a936295d 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -94,5 +94,11 @@ Swap two inputs; that is, show differences from index or on-disk file to tree contents. +--text:: + Treat all files as text. + +-a:: + Shorthand for "--text". + For more detailed explanation on these common options, see also link:diffcore.html[diffcore documentation]. diff --git a/git-diff-files.html b/git-diff-files.html index 219776571..44df9c646 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -490,6 +490,22 @@ same as "git-diff-index" and "git-diff-tree".

on-disk file to tree contents.

+
+--text +
+
+

+ Treat all files as text. +

+
+
+-a +
+
+

+ Shorthand for "--text". +

+

For more detailed explanation on these common options, see also diffcore documentation.

@@ -847,7 +863,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff-index.html b/git-diff-index.html index 428e3b6c6..9d8e4d77a 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -491,6 +491,22 @@ entries in the index are compared.

on-disk file to tree contents.

+
+--text +
+
+

+ Treat all files as text. +

+
+
+-a +
+
+

+ Shorthand for "--text". +

+

For more detailed explanation on these common options, see also diffcore documentation.

@@ -937,7 +953,7 @@ always have the special all-zero sha1. diff --git a/git-diff-stages.html b/git-diff-stages.html index 82a423f4c..d05021861 100644 --- a/git-diff-stages.html +++ b/git-diff-stages.html @@ -488,6 +488,22 @@ unmerged index file.

on-disk file to tree contents.

+
+--text +
+
+

+ Treat all files as text. +

+
+
+-a +
+
+

+ Shorthand for "--text". +

+

For more detailed explanation on these common options, see also diffcore documentation.

@@ -821,7 +837,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff-tree.html b/git-diff-tree.html index 4f7af226b..ebe55f0aa 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -493,6 +493,22 @@ git-diff-tree(1) Manual Page on-disk file to tree contents.

+
+--text +
+
+

+ Treat all files as text. +

+
+
+-a +
+
+

+ Shorthand for "--text". +

+

For more detailed explanation on these common options, see also diffcore documentation.

@@ -1009,7 +1025,7 @@ two unresolved merge parents with the working tree file -- 2.26.2