diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-04-30 13:50:26 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-04-30 13:50:26 +0900 |
commit | 59bb0aa93e6edaca44b2a5488fc915d468bae46f (patch) | |
tree | 767fc86623415632a6cbee709b2484bf0d91d53a /Documentation/config | |
parent | Merge branch 'ds/sparse-index-protections' (diff) | |
parent | doc/diff-options: document new --diff-merges features (diff) | |
download | tgif-59bb0aa93e6edaca44b2a5488fc915d468bae46f.tar.xz |
Merge branch 'so/log-diff-merge'
"git log" learned "--diff-merges=<style>" option, with an
associated configuration variable log.diffMerges.
* so/log-diff-merge:
doc/diff-options: document new --diff-merges features
diff-merges: introduce log.diffMerges config variable
diff-merges: adapt -m to enable default diff format
diff-merges: refactor set_diff_merges()
diff-merges: introduce --diff-merges=on
Diffstat (limited to 'Documentation/config')
-rw-r--r-- | Documentation/config/log.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/config/log.txt b/Documentation/config/log.txt index 208d5fdcaa..456eb07800 100644 --- a/Documentation/config/log.txt +++ b/Documentation/config/log.txt @@ -24,6 +24,11 @@ log.excludeDecoration:: the config option can be overridden by the `--decorate-refs` option. +log.diffMerges:: + Set default diff format to be used for merge commits. See + `--diff-merges` in linkgit:git-log[1] for details. + Defaults to `separate`. + log.follow:: If `true`, `git log` will act as if the `--follow` option was used when a single <path> is given. This has the same limitations as `--follow`, |