From: Junio C Hamano <gitster@pobox.com>
To: Sergey Organov <sorganov@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 3/3] diff-merges: clarify log.diffMerges documentation
Date: Thu, 15 Sep 2022 11:43:11 -0700 [thread overview]
Message-ID: <xmqqr10cmqbk.fsf@gitster.g> (raw)
In-Reply-To: <20220914193102.5275-4-sorganov@gmail.com> (Sergey Organov's message of "Wed, 14 Sep 2022 22:31:02 +0300")
Sergey Organov <sorganov@gmail.com> writes:
> Signed-off-by: Sergey Organov <sorganov@gmail.com>
> ---
> Documentation/config/log.txt | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/config/log.txt b/Documentation/config/log.txt
> index 5250ba45fb4e..cbe34d759221 100644
> --- a/Documentation/config/log.txt
> +++ b/Documentation/config/log.txt
> @@ -30,9 +30,9 @@ log.excludeDecoration::
> 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`.
> + Set diff format to be used when `--diff-merges=on` is
> + specified, 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
Is the reason why the patch drops "default" because the value given
is used only when --diff-merges=on is given, and does not kick in
when "--diff-merges=<format>" is explicitly given?
The rest of the change does make sense.
next prev parent reply other threads:[~2022-09-15 18:43 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-14 19:30 [PATCH 0/3] diff-merges: minor cleanups Sergey Organov
2022-09-14 19:31 ` [PATCH 1/3] diff-merges: cleanup func_by_opt() Sergey Organov
2022-09-15 18:47 ` Junio C Hamano
2022-09-16 13:01 ` Sergey Organov
2022-09-16 16:14 ` Junio C Hamano
2022-09-16 16:28 ` Sergey Organov
2022-09-14 19:31 ` [PATCH 2/3] diff-merges: cleanup set_diff_merges() Sergey Organov
2022-09-15 20:41 ` Junio C Hamano
2022-09-16 13:38 ` Sergey Organov
2022-09-14 19:31 ` [PATCH 3/3] diff-merges: clarify log.diffMerges documentation Sergey Organov
2022-09-15 18:43 ` Junio C Hamano [this message]
2022-09-16 13:46 ` Sergey Organov
2022-09-16 16:21 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqr10cmqbk.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=sorganov@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.