diff options
| author | Sergey Organov <sorganov@gmail.com> | 2022-09-14 21:31:02 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-09-16 18:21:44 +0200 |
| commit | c34a6bd291d5bfe2bec22d1c5441f8712306a527 (patch) | |
| tree | 941133510e4ede92d80c73633cc3cbdaa69b0893 | |
| parent | diff-merges: cleanup set_diff_merges() (diff) | |
| download | git-c34a6bd291d5bfe2bec22d1c5441f8712306a527.tar.xz git-c34a6bd291d5bfe2bec22d1c5441f8712306a527.zip | |
diff-merges: clarify log.diffMerges documentation
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/config/log.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/config/log.txt b/Documentation/config/log.txt index bc63bc3939..5f96cf87fb 100644 --- a/Documentation/config/log.txt +++ b/Documentation/config/log.txt @@ -34,9 +34,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 |