Signed-off-by: Koosha Khajehmoogahi <koosha@xxxxxxxxx> --- Documentation/git-log.txt | 3 +++ Documentation/rev-list-options.txt | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index 1f7bc67..506125a 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -190,6 +190,9 @@ log.showroot:: `git log -p` output would be shown without a diff attached. The default is `true`. +log.merges:: + Default for `--merges` option. Defaults to `show`. + mailmap.*:: See linkgit:git-shortlog[1]. diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index 4ed8587..398e657 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -99,6 +99,12 @@ if it is part of the log message. --merges:: Print only merge commits. This is exactly the same as `--min-parents=2`. +--merges=show|hide|only:: + If show is specified, merge commits will be shown in conjunction with + other commits. If hide is specified, it will work like `--no-merges`. + If only is specified, it will work like `--merges`. The default option + is show. + --no-merges:: Do not print commits with more than one parent. This is exactly the same as `--max-parents=1`. -- 2.3.3.263.g095251d.dirty -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html