projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Documentation: asciidoc sources are utf-8
[git.git]
/
Documentation
/
diff-options.txt
diff --git
a/Documentation/diff-options.txt
b/Documentation/diff-options.txt
index
06500d0
..
8eef86e
100644
(file)
--- a/
Documentation/diff-options.txt
+++ b/
Documentation/diff-options.txt
@@
-4,10
+4,6
@@
-u::
Synonym for "-p".
-u::
Synonym for "-p".
--r::
- Look recursively in subdirectories; only used by "git-diff-tree";
- other diff commands always work recursively.
-
-z::
\0 line termination on output
-z::
\0 line termination on output
@@
-54,7
+50,7
@@
<orderfile>, which has one shell glob pattern per line.
-R::
<orderfile>, which has one shell glob pattern per line.
-R::
- Swap two inputs; that is, show differences from
cache
or
+ Swap two inputs; that is, show differences from
index
or
on-disk file to tree contents.
For more detailed explanation on these common options, see also
on-disk file to tree contents.
For more detailed explanation on these common options, see also