From 5c91da25d7da304d98c8808968f474f9fb7ac4db Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Tue, 11 Apr 2006 13:22:17 +0200 Subject: [PATCH] Document --patch-with-raw Signed-off-by: Petr Baudis Signed-off-by: Junio C Hamano --- Documentation/diff-options.txt | 3 +++ diff.h | 2 ++ 2 files changed, 5 insertions(+) diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index ec6811c71..338014c81 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 07b153b56..c5372b984 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" \ -- 2.30.2