Merge branch 'jc/withraw' into next

* jc/withraw:
  Separate the raw diff and patch with a newline
  Document --patch-with-raw

1 files changed, 2 insertions, 0 deletions

diff --git a/diff.h b/diff.h
index 07b153b567..c5372b984a 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" \