From: Koosha Khajehmoogahi <koosha@posteo.de>
To: Eric Sunshine <sunshine@sunshineco.com>
Cc: Git List <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v3 3/5] Documentation: add git-log --merges= option and log.merges config. var
Date: Thu, 16 Apr 2015 00:27:35 +0200 [thread overview]
Message-ID: <552EE5D7.9070703@posteo.de> (raw)
In-Reply-To: <CAPig+cQG4NxxmtaQ49xsU3g6UwZb0RqE67PnQBeYrRv=2CGodw@mail.gmail.com>
On 04/14/2015 08:42 AM, Eric Sunshine wrote:
> 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
Should I send a new reroll or wait for reviews on my other commits.
I have not received any review on other patches of this series yet.
--
Koosha
next prev parent reply other threads:[~2015-04-15 22:28 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-13 15:29 [PATCH v3 1/5] revision: add --merges={show|only|hide} option Koosha Khajehmoogahi
2015-04-13 15:29 ` [PATCH v3 2/5] log: honor log.merges= option Koosha Khajehmoogahi
2015-04-16 6:07 ` Junio C Hamano
2015-04-13 15:29 ` [PATCH v3 3/5] Documentation: add git-log --merges= option and log.merges config. var Koosha Khajehmoogahi
2015-04-14 6:42 ` Eric Sunshine
2015-04-15 22:27 ` Koosha Khajehmoogahi [this message]
2015-04-16 4:49 ` Eric Sunshine
2015-04-13 15:29 ` [PATCH v3 4/5] t4202-log: add tests for --merges= Koosha Khajehmoogahi
2015-04-14 6:52 ` Eric Sunshine
2015-04-13 15:29 ` [PATCH v3 5/5] bash-completion: add support for git-log --merges= and log.merges Koosha Khajehmoogahi
2015-04-21 12:51 ` [PATCH] squash! " SZEDER Gábor
2015-04-21 17:42 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=552EE5D7.9070703@posteo.de \
--to=koosha@posteo.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).