From: Koosha Khajehmoogahi Date: Sat, 04 Apr 2015 01:21:59 GMT Subject: [PATCH v2 3/5] Documentation: add git-log --merges= option and log.merges config. var Message-ID: <1428110521-31028-3-git-send-email-koosha@posteo.de> In-Reply-To: <1428110521-31028-1-git-send-email-koosha@posteo.de> Helped-by: Eric Sunshine Signed-off-by: Koosha Khajehmoogahi --- Documentation/git-log.txt | 3 +++ Documentation/rev-list-options.txt | 18 +++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index 18bc716..e16f0f8 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 f620ee4..0bb2390 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -96,12 +96,24 @@ if it is part of the log message. --remove-empty:: Stop when a given path disappears from the tree. +--merges={show|hide|only}:: ++ +-- +`show`: show both merge and non-merge commits + +`hide`: only show non-merge commits; same as `--max-parents=1` + +`only`: only show merge commits; same as `--min-parents=2` + +If `--merges=` is not specified, default value is `show`. +-- ++ + --merges:: - Print only merge commits. This is exactly the same as `--min-parents=2`. + Shorthand for `--merges=only`. --no-merges:: - Do not print commits with more than one parent. This is - exactly the same as `--max-parents=1`. + Shorthand for `--merges=hide`. --min-parents=:: --max-parents=:: -- 2.3.3.263.g095251d.dirty