Re: [PATCH v3 3/5] Documentation: add git-log --merges= option and log.merges config. var

> On Mon, Apr 13, 2015 at 11:29 AM, Koosha Khajehmoogahi <koosha@posteo.de> wrote:
>> From: Junio C Hamano <gitster@pobox.com>
>>
>> [kk: added documentation in git-log.txt]
>>
>> Signed-off-by: Koosha Khajehmoogahi <koosha@posteo.de>
>> ---
>> diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
>> index f620ee4..88f152f 100644
>> --- a/Documentation/rev-list-options.txt
>> +++ b/Documentation/rev-list-options.txt
>> @@ -96,6 +96,23 @@ if it is part of the log message.
>>  --remove-empty::
>>         Stop when a given path disappears from the tree.
>>
>> +--merges={show|hide|only}::
>> +
>> +       Limit the output by type of commits.
>> +
>> +       `hide`;;
>> +               Hide merge commits from the output.
>> +
>> +       `only`;;
>> +               Hide non-merge commits from the output (i.e showing
>> +               only merge commits).
>> +
>> +       `show`;;
>> +               Do not hide either merge or non-merge commits. This
>> +               is primarily useful when the user has non-standard
>> +               setting of `log.merges` configuration variable that
>> +               needs to be overriden from the command line.
> 
> s/overriden/overridden/
> 
>>  --merges::
>>         Print only merge commits. This is exactly the same as `--min-parents=2`.
>>
>> --
>> 2.3.3.263.g095251d.dirty