summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-07-09 07:52:36 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-07-09 07:52:36 (GMT)
commit88f0d5d7d95f815d2e8a36a8ceb7459dbd90992c (patch)
tree926ba840250be0456f868099bf4a498c64c51e2f /Documentation
parentf3aafa4db29c3d4799eeeda21efaf15d364ae59a (diff)
parentd507bb15008d6ee657eebaf2803bf0964af12c93 (diff)
downloadgit-88f0d5d7d95f815d2e8a36a8ceb7459dbd90992c.zip
git-88f0d5d7d95f815d2e8a36a8ceb7459dbd90992c.tar.gz
git-88f0d5d7d95f815d2e8a36a8ceb7459dbd90992c.tar.bz2
Merge branch 'sf/diff'
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/diff-options.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index f523ec2..1a93629 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/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].