diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-03-07 12:17:00 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-07 12:17:00 +0900 |
| commit | 11f1537a82c84e620d742b3bc4256952defb28df (patch) | |
| tree | 2923ff40fbf10f29b7eaa506c2deb52e00e08dde /diff-options.txt | |
| parent | 9149123b58ede4ca92a71abd3c09e3e2ad205b55 (diff) | |
| download | git-htmldocs-11f1537a82c84e620d742b3bc4256952defb28df.tar.gz | |
Autogenerated HTML docs for v2.21.0-135-g6e0cc
Diffstat (limited to 'diff-options.txt')
| -rw-r--r-- | diff-options.txt | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/diff-options.txt b/diff-options.txt index 554a34080..5ebc56867 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -36,11 +36,21 @@ endif::git-format-patch[] -U<n>:: --unified=<n>:: Generate diffs with <n> lines of context instead of - the usual three. + the usual three. Implies `--patch`. ifndef::git-format-patch[] Implies `-p`. endif::git-format-patch[] +--output=<file>:: + Output to a specific file instead of stdout. + +--output-indicator-new=<char>:: +--output-indicator-old=<char>:: +--output-indicator-context=<char>:: + Specify the character used to indicate new, old or context + lines in the generated patch. Normally they are '+', '-' and + ' ' respectively. + ifndef::git-format-patch[] --raw:: ifndef::git-log[] @@ -148,6 +158,7 @@ These parameters can also be set individually with `--stat-width=<width>`, number of modified files, as well as number of added and deleted lines. +-X[<param1,param2,...>]:: --dirstat[=<param1,param2,...>]:: Output the distribution of relative amount of changes for each 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, and accumulating child directory counts in the parent directories: `--dirstat=files,10,cumulative`. +--cumulative:: + Synonym for --dirstat=cumulative + +--dirstat-by-file[=<param1,param2>...]:: + Synonym for --dirstat=files,param1,param2... + --summary:: Output a condensed summary of extended header information such as creations, renames and mode changes. @@ -386,6 +403,9 @@ endif::git-format-patch[] Turn off rename detection, even when the configuration file gives the default to do so. +--[no-]rename-empty:: + Whether to use empty blobs as rename source. + ifndef::git-format-patch[] --check:: Warn if changes introduce conflict markers or whitespace errors. |