git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Eric Sunshine <sunshine@sunshineco.com>
Date
Apr 16, 2015, 04:49 UTC
Message-ID
<CAPig+cS7aCN5Boevnp_S+rgJP4GKxpMeVSnjEaWEKcNECC-21A@mail.gmail.com>
In-Reply-To
<552EE5D7.9070703@posteo.de>
On Wed, Apr 15, 2015 at 6:27 PM, Koosha Khajehmoogahi <koosha@posteo.de> wrote:
Show 33 quoted lines
> 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>
>>> ---
>>> @@ -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/
>
> 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.

Lack of review comments does not necessarily mean that people did not review the patches; it could mean that reviewers had nothing more to say. In addition to pointing out the typo above, I also made a small comment[1] on patch 4/5, but otherwise did not find anything else about which to comment.

Whether or not you should re-send is something Junio can answer. He will sometimes silently pick up a series as-is or sometimes silently make minor fixes based upon review comments. Check his 'pu' branch periodically to see if your series appears there and if it has those minor adjustments. If not, and if he doesn't answer this question, then you may need to re-roll.

[1]: http://article.gmane.org/gmane.comp.version-control.git/267118
Previous: Koosha KhajehmoogahiNext: Koosha Khajehmoogahi
Message 7 of 12 in “revision: add --merges={show|only|hide} option”
  1. 1/5 revision: add --merges={show|only|hide} optionKoosha Khajehmoogahi, Apr 13, 2015
  2. 2/5 log: honor log.merges= optionKoosha Khajehmoogahi, Apr 13, 2015
  3. Junio C HamanoApr 16, 2015
  4. 3/5 Documentation: add git-log --merges= option and log.merges config. varKoosha Khajehmoogahi, Apr 13, 2015
  5. Eric SunshineApr 14, 2015
  6. Koosha KhajehmoogahiApr 15, 2015
  7. Eric SunshineApr 16, 2015
  8. 4/5 t4202-log: add tests for --merges=Koosha Khajehmoogahi, Apr 13, 2015
  9. Eric SunshineApr 14, 2015
  10. 5/5 bash-completion: add support for git-log --merges= and log.mergesKoosha Khajehmoogahi, Apr 13, 2015
  11. squash! bash-completion: add support for git-log --merges= and log.mergesSZEDER Gábor, Apr 21, 2015
  12. Junio C HamanoApr 21, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.