summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-04-11 11:52:01 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-04-11 11:52:01 -0700
commit55275b3812af3fe84516f176e589100232aef4f5 (patch)
treee6e31d8f35ccb7119737bf14c9621db12fad7d1d /Documentation
parentMerge branch 'eb/apply' into next (diff)
parentSeparate the raw diff and patch with a newline (diff)
downloadtgif-55275b3812af3fe84516f176e589100232aef4f5.tar.xz
Merge branch 'jc/withraw' into next
* jc/withraw: Separate the raw diff and patch with a newline Document --patch-with-raw
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/diff-options.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index ec6811c718..338014c816 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