summaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
diff options
context:
space:
mode:
authorLibravatar Stephan Feder <sf@b-i-t.de>2006-07-07 15:57:09 +0200
committerLibravatar Junio C Hamano <junkio@cox.net>2006-07-07 12:28:04 -0700
commitd507bb15008d6ee657eebaf2803bf0964af12c93 (patch)
treeb87fc33853b0cf7847e4892b278d7489204c4086 /Documentation/diff-options.txt
parentAdd -a and --text to common diff options help (diff)
downloadtgif-d507bb15008d6ee657eebaf2803bf0964af12c93.tar.xz
diff-options: Explain --text and -a
Signed-off-by: Stephan Feder <sf@b-i-t.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/diff-options.txt')
-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 f523ec2fbe..1a936295d8 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].