Sergey Organov <sorganov@xxxxxxxxx> writes: > Signed-off-by: Sergey Organov <sorganov@xxxxxxxxx> > --- > 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.
