From: Junio C Hamano
Date: Sun, 9 Jul 2006 09:38:14 +0000 (+0000)
Subject: Autogenerated HTML docs for v1.4.1-g88f0d
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c26f5488a78cd9e6bdcc963590ca3a5895877906;p=git.git
Autogenerated HTML docs for v1.4.1-g88f0d
---
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