diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-07-09 00:52:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-09 00:52:36 -0700 |
| commit | 88f0d5d7d95f815d2e8a36a8ceb7459dbd90992c (patch) | |
| tree | 926ba840250be0456f868099bf4a498c64c51e2f /Documentation | |
| parent | Disable color detection during format-patch (diff) | |
| parent | diff-options: Explain --text and -a (diff) | |
| download | tgif-88f0d5d7d95f815d2e8a36a8ceb7459dbd90992c.tar.xz | |
Merge branch 'sf/diff'
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/diff-options.txt | 6 |
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]. |