summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetr Baudis <pasky@suse.cz>2006-04-11 11:22:17 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-11 18:16:51 (GMT)
commit5c91da25d7da304d98c8808968f474f9fb7ac4db (patch)
tree7a6b67072f6759d47aa9f7e108f048d0351f1a5f
parent86ff1d2012cc5e074d54c0823154019b99ca03f0 (diff)
downloadgit-5c91da25d7da304d98c8808968f474f9fb7ac4db.zip
git-5c91da25d7da304d98c8808968f474f9fb7ac4db.tar.gz
git-5c91da25d7da304d98c8808968f474f9fb7ac4db.tar.bz2
Document --patch-with-raw
Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Documentation/diff-options.txt3
-rw-r--r--diff.h2
2 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index ec6811c..338014c 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -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
diff --git a/diff.h b/diff.h
index 07b153b..c5372b9 100644
--- a/diff.h
+++ b/diff.h
@@ -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" \