diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-02-16 17:32:33 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-16 17:32:33 -0800 |
| commit | f1fc6ca2d27889be2f7829e15054bc8067ae9bc6 (patch) | |
| tree | 3fb51df8e90ddd23c17c8a61a25df915ca6e7d73 /diff-options.txt | |
| parent | 0170485c457d7e861874a761fb76ee8de1a79d89 (diff) | |
| download | git-htmldocs-f1fc6ca2d27889be2f7829e15054bc8067ae9bc6.tar.gz | |
Autogenerated HTML docs for v2.35.1-193-g45fe28
Diffstat (limited to 'diff-options.txt')
| -rw-r--r-- | diff-options.txt | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/diff-options.txt b/diff-options.txt index c89d530d3..3674ac48e 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|on|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|remerge|r):: --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 @@ -64,6 +64,18 @@ ifdef::git-log[] each of the parents. Separate log entry and diff is generated for each parent. + +--diff-merges=remerge::: +--diff-merges=r::: +--remerge-diff::: + With this option, two-parent merge commits are remerged to + create a temporary tree object -- potentially containing files + with conflict markers and such. A diff is then shown between + that temporary tree and the actual merge commit. ++ +The output emitted when this option is used is subject to change, and +so is its interaction with other options (unless explicitly +documented). ++ --diff-merges=combined::: --diff-merges=c::: -c::: @@ -616,11 +628,8 @@ ifndef::git-format-patch[] Also, these upper-case letters can be downcased to exclude. E.g. `--diff-filter=ad` excludes added and deleted paths. + -Note that not all diffs can feature all types. For instance, diffs -from the index to the working tree can never have Added entries -(because the set of paths included in the diff is limited by what is in -the index). Similarly, copied and renamed entries cannot appear if -detection for those types is disabled. +Note that not all diffs can feature all types. For instance, copied and +renamed entries cannot appear if detection for those types is disabled. -S<string>:: Look for differences that change the number of occurrences of |