diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-02-05 17:37:47 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-02-05 17:37:47 -0800 |
commit | 8c860d674a0fd61e7ec06e9025c19101cc058eff (patch) | |
tree | 2f79a6ed738fc24aee4477f9cc1e2e9b540a10ab /diff-options.txt | |
parent | 68d44a202822cda89f04e8e831531734207c6cd4 (diff) | |
download | git-htmldocs-8c860d674a0fd61e7ec06e9025c19101cc058eff.tar.gz |
Autogenerated HTML docs for v2.30.0-452-gfb7fa
Diffstat (limited to 'diff-options.txt')
-rw-r--r-- | diff-options.txt | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/diff-options.txt b/diff-options.txt index 746b144c7..e5733ccb2 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -33,6 +33,57 @@ endif::git-diff[] show the patch by default, or to cancel the effect of `--patch`. endif::git-format-patch[] +ifdef::git-log[] +--diff-merges=(off|none|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 + `first-parent` is the default. ++ +--diff-merges=(off|none)::: +--no-diff-merges::: + Disable output of diffs for merge commits. Useful to override + implied value. ++ +--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`. ++ +--diff-merges=combined::: +--diff-merges=c::: +-c::: + With this option, diff output for a merge commit shows the + differences from each of the parents to the merge result + simultaneously instead of showing pairwise diff between a + parent and the result one at a time. Furthermore, it lists + only files which were modified from all parents. `-c` implies + `-p`. ++ +--diff-merges=dense-combined::: +--diff-merges=cc::: +--cc::: + With this option the output produced by + `--diff-merges=combined` is further compressed by omitting + uninteresting hunks whose contents in the parents have only + two variants and the merge result picks one of them without + modification. `--cc` implies `-p`. + +--combined-all-paths:: + This flag causes combined diffs (used for merge commits) to + list the name of the file from all parents. It thus only has + effect when `--diff-merges=[dense-]combined` is in use, and + is likely only useful if filename changes are detected (i.e. + when either rename or copy detection have been requested). +endif::git-log[] + -U<n>:: --unified=<n>:: Generate diffs with <n> lines of context instead of |