diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-11 11:52:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-11 11:52:01 -0700 |
| commit | 55275b3812af3fe84516f176e589100232aef4f5 (patch) | |
| tree | e6e31d8f35ccb7119737bf14c9621db12fad7d1d /Documentation | |
| parent | 8fcd4218c63d15481d8fbb12c3fddfffa98e1adc (diff) | |
| parent | 90c1b08c7dc5be890e697237f67a188da235ffc8 (diff) | |
| download | git-55275b3812af3fe84516f176e589100232aef4f5.tar.gz | |
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.txt | 3 |
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 |