Skip to content

Commit 5c91da2

Browse files
Petr BaudisJunio C Hamano
authored andcommitted
Document --patch-with-raw
Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 86ff1d2 commit 5c91da2

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

Documentation/diff-options.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
-u::
55
Synonym for "-p".
66

7+
--patch-with-raw::
8+
Generate patch but keep also the default raw diff output.
9+
710
-z::
811
\0 line termination on output
912

diff.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@ extern void diffcore_std_no_resolve(struct diff_options *);
113113
" -z output diff-raw with lines terminated with NUL.\n" \
114114
" -p output patch format.\n" \
115115
" -u synonym for -p.\n" \
116+
" --patch-with-raw\n" \
117+
" output both a patch and the diff-raw format.\n" \
116118
" --name-only show only names of changed files.\n" \
117119
" --name-status show names and status of changed files.\n" \
118120
" --full-index show full object name on index lines.\n" \

0 commit comments

Comments
 (0)