Skip to content

Commit 4ab0f13

Browse files
gitstergitster
committed
Merge branch 'nd/diff-parseopt-2'
Second batch to teach the diff machinery to use the parse-options API. * nd/diff-parseopt-2: (21 commits) diff-parseopt: convert --ignore-some-changes diff-parseopt: convert --[no-]minimal diff-parseopt: convert --relative diff-parseopt: convert --no-renames|--[no--rename-empty diff-parseopt: convert --find-copies-harder diff-parseopt: convert -C|--find-copies diff-parseopt: convert -D|--irreversible-delete diff-parseopt: convert -M|--find-renames diff-parseopt: convert -B|--break-rewrites diff-parseopt: convert --output-* diff-parseopt: convert --[no-]compact-summary diff-parseopt: convert --stat* diff-parseopt: convert -s|--no-patch diff-parseopt: convert --name-status diff-parseopt: convert --name-only diff-parseopt: convert --patch-with-stat diff-parseopt: convert --summary diff-parseopt: convert --check diff-parseopt: convert --dirstat and friends diff-parseopt: convert --numstat and --shortstat ...
2 parents 082c15a + 87649a1 commit 4ab0f13

File tree

2 files changed

+319
-211
lines changed

2 files changed

+319
-211
lines changed

‎Documentation/diff-options.txt‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,16 @@ ifndef::git-format-patch[]
4141
Implies `-p`.
4242
endif::git-format-patch[]
4343

44+
--output=<file>::
45+
Output to a specific file instead of stdout.
46+
47+
--output-indicator-new=<char>::
48+
--output-indicator-old=<char>::
49+
--output-indicator-context=<char>::
50+
Specify the character used to indicate new, old or context
51+
lines in the generated patch. Normally they are '+', '-' and
52+
' ' respectively.
53+
4454
ifndef::git-format-patch[]
4555
--raw::
4656
ifndef::git-log[]
@@ -148,6 +158,7 @@ These parameters can also be set individually with `--stat-width=<width>`,
148158
number of modified files, as well as number of added and deleted
149159
lines.
150160

161+
-X[<param1,param2,...>]::
151162
--dirstat[=<param1,param2,...>]::
152163
Output the distribution of relative amount of changes for each
153164
sub-directory. The behavior of `--dirstat` can be customized by
@@ -192,6 +203,12 @@ directories with less than 10% of the total amount of changed files,
192203
and accumulating child directory counts in the parent directories:
193204
`--dirstat=files,10,cumulative`.
194205

206+
--cumulative::
207+
Synonym for --dirstat=cumulative
208+
209+
--dirstat-by-file[=<param1,param2>...]::
210+
Synonym for --dirstat=files,param1,param2...
211+
195212
--summary::
196213
Output a condensed summary of extended header information
197214
such as creations, renames and mode changes.
@@ -386,6 +403,9 @@ endif::git-format-patch[]
386403
Turn off rename detection, even when the configuration
387404
file gives the default to do so.
388405

406+
--[no-]rename-empty::
407+
Whether to use empty blobs as rename source.
408+
389409
ifndef::git-format-patch[]
390410
--check::
391411
Warn if changes introduce conflict markers or whitespace errors.

0 commit comments

Comments
 (0)