diff mbox series

[v2,5/5] doc/diff-options: document new --diff-merges features

Message ID 20210413114118.25693-6-sorganov@gmail.com (mailing list archive)
State Accepted
Commit 364bc11fe5711fe7fbb98abf376168a207e7a448
Headers show
Series [v2,1/5] diff-merges: introduce --diff-merges=on | expand

Commit Message

Sergey Organov April 13, 2021, 11:41 a.m. UTC
Document changes in -m and --diff-merges=m semantics, as well as new
--diff-merges=on option.

Signed-off-by: Sergey Organov <sorganov@gmail.com>
 Documentation/diff-options.txt | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)
diff mbox series


diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index aa2b5c11f20b..6d968b9012dc 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -34,7 +34,7 @@  endif::git-diff[]
 	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.
+	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`.
 	This option makes merge commits show the full diff with
 	respect to the first parent only.
 	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.