projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
revision parsing: make "rev -- paths" checks stronger.
[git.git]
/
Documentation
/
diff-options.txt
diff --git
a/Documentation/diff-options.txt
b/Documentation/diff-options.txt
index
2a0275e
..
c183dc9
100644
(file)
--- a/
Documentation/diff-options.txt
+++ b/
Documentation/diff-options.txt
@@
-4,6
+4,15
@@
-u::
Synonym for "-p".
-u::
Synonym for "-p".
+--patch-with-raw::
+ Generate patch but keep also the default raw diff output.
+
+--stat::
+ Generate a diffstat instead of a patch.
+
+--patch-with-stat::
+ Generate patch and prepend its diffstat.
+
-z::
\0 line termination on output
-z::
\0 line termination on output
@@
-69,6
+78,10
@@
changeset, not just the files that contain the change
in <string>.
changeset, not just the files that contain the change
in <string>.
+--pickaxe-regex::
+ Make the <string> not a plain string but an extended POSIX
+ regex to match.
+
-O<orderfile>::
Output the patch in the order specified in the
<orderfile>, which has one shell glob pattern per line.
-O<orderfile>::
Output the patch in the order specified in the
<orderfile>, which has one shell glob pattern per line.