diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-04-30 15:08:10 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-04-30 15:08:10 +0900 |
| commit | 4078a55a6fb467915a2f03f271d1390b97eabc13 (patch) | |
| tree | 94f9713738bf23d7a7bce9c87937558570412c71 /diff-options.txt | |
| parent | 9877648272f630de87aeee2e3a8b7f4ac1ad9c70 (diff) | |
| download | git-htmldocs-4078a55a6fb467915a2f03f271d1390b97eabc13.tar.gz | |
Autogenerated HTML docs for v2.31.1-442-g7e391
Diffstat (limited to 'diff-options.txt')
| -rw-r--r-- | diff-options.txt | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/diff-options.txt b/diff-options.txt index aa2b5c11f..530d11591 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -34,7 +34,7 @@ endif::git-diff[] endif::git-format-patch[] ifdef::git-log[] ---diff-merges=(off|none|first-parent|1|separate|m|combined|c|dense-combined|cc):: +--diff-merges=(off|none|on|first-parent|1|separate|m|combined|c|dense-combined|cc):: --no-diff-merges:: Specify diff format to be used for merge commits. Default is {diff-merges-default} unless `--first-parent` is in use, in which case @@ -45,17 +45,24 @@ ifdef::git-log[] Disable output of diffs for merge commits. Useful to override implied value. + +--diff-merges=on::: +--diff-merges=m::: +-m::: + This option makes diff output for merge commits to be shown in + the default format. `-m` will produce the output only if `-p` + is given as well. The default format could be changed using + `log.diffMerges` configuration parameter, which default value + is `separate`. ++ --diff-merges=first-parent::: --diff-merges=1::: This option makes merge commits show the full diff with respect to the first parent only. + --diff-merges=separate::: ---diff-merges=m::: --m::: This makes merge commits show the full diff with respect to each of the parents. Separate log entry and diff is generated - for each parent. `-m` doesn't produce any output without `-p`. + for each parent. + --diff-merges=combined::: --diff-merges=c::: @@ -293,11 +300,14 @@ explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). --name-only:: - Show only names of changed files. + Show only names of changed files. The file names are often encoded in UTF-8. + For more information see the discussion about encoding in the linkgit:git-log[1] + manual page. --name-status:: Show only names and status of changed files. See the description of the `--diff-filter` option on what the status letters mean. + Just like `--name-only` the file names are often encoded in UTF-8. --submodule[=<format>]:: Specify how differences in submodules are shown. When specifying |