summaryrefslogtreecommitdiff
path: root/Documentation/config
diff options
context:
space:
mode:
authorSergey Organov <sorganov@gmail.com>2021-04-13 11:41:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-04-17 06:38:35 (GMT)
commit17c13e60fd799336b28d320dcba06fe1ef06e01d (patch)
tree06050127b529d7308656ae8a218c3e7c9db5d431 /Documentation/config
parent38fc4dbbc2f110192752a3b2c99abb745f0494bf (diff)
downloadgit-17c13e60fd799336b28d320dcba06fe1ef06e01d.zip
git-17c13e60fd799336b28d320dcba06fe1ef06e01d.tar.gz
git-17c13e60fd799336b28d320dcba06fe1ef06e01d.tar.bz2
diff-merges: introduce log.diffMerges config variable
New log.diffMerges configuration variable sets the format that --diff-merges=on will be using. The default is "separate". t4013: add the following tests for log.diffMerges config: * Test that wrong values are denied. * Test that the value of log.diffMerges properly affects both --diff-merges=on and -m. t9902: fix completion tests for log.d* to match log.diffMerges. Added documentation for log.diffMerges. Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/config')
-rw-r--r--Documentation/config/log.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/config/log.txt b/Documentation/config/log.txt
index 208d5fd..456eb07 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`,