Browse Source

Document --patch-with-raw

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Petr Baudis 19 years ago committed by Junio C Hamano
parent
commit
5c91da25d7
  1. 3
      Documentation/diff-options.txt
  2. 2
      diff.h

3
Documentation/diff-options.txt

@ -4,6 +4,9 @@ @@ -4,6 +4,9 @@
-u::
Synonym for "-p".

--patch-with-raw::
Generate patch but keep also the default raw diff output.

-z::
\0 line termination on output


2
diff.h

@ -113,6 +113,8 @@ extern void diffcore_std_no_resolve(struct diff_options *); @@ -113,6 +113,8 @@ extern void diffcore_std_no_resolve(struct diff_options *);
" -z output diff-raw with lines terminated with NUL.\n" \
" -p output patch format.\n" \
" -u synonym for -p.\n" \
" --patch-with-raw\n" \
" output both a patch and the diff-raw format.\n" \
" --name-only show only names of changed files.\n" \
" --name-status show names and status of changed files.\n" \
" --full-index show full object name on index lines.\n" \

Loading…
Cancel
Save