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

Re: [PATCH 2/3] doc/git-log: describe --diff-merges=off

From
Sergey Organov <sorganov@gmail.com>
Date
Aug 12, 2020, 08:08 UTC
Message-ID
<87imdoe16z.fsf@osv.gnss.ru>
In-Reply-To
<xmqqzh707kq1.fsf@gitster.c.googlers.com>
Junio C Hamano <gitster@pobox.com> writes:
Show 22 quoted lines
> Junio C Hamano <gitster@pobox.com> writes:
>
>> Sergey Organov <sorganov@gmail.com> writes:
>>
>>> Signed-off-by: Sergey Organov <sorganov@gmail.com>
>>> ---
>>>  Documentation/git-log.txt | 6 +++++-
>>>  1 file changed, 5 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
>>> index 9ccba65469d7..f3727c786453 100644
>>> --- a/Documentation/git-log.txt
>>> +++ b/Documentation/git-log.txt
>>> @@ -145,7 +145,6 @@ combined-diff option or with `--no-diff-merges`).
>>>  	rename or copy detection have been requested).
>>>  
>>>  -m::
>>> ---diff-merges::
>>
>> Shouldn't this "--diff-merges" be removed from here?
>
> Sorry, my eyes.  Yes, you are removing it from here.

Don't mention it, -- these "---" caught me as well when I first looked at the diff!

Thanks, -- Sergey

Previous: Junio C HamanoNext: Sergey Organov
Message 5 of 17 in “Change "--diff-merges" to require parameter”
  1. 0/3 Change "--diff-merges" to require parameterSergey Organov, Aug 5, 2020
  2. 2/3 doc/git-log: describe --diff-merges=offSergey Organov, Aug 5, 2020
  3. Junio C HamanoAug 12, 2020
  4. Junio C HamanoAug 12, 2020
  5. Sergey OrganovAug 12, 2020
  6. 1/3 revision: change "--diff-merges" option to require parameterSergey Organov, Aug 5, 2020
  7. 3/3 t/t4013: add test for --diff-merges=offSergey Organov, Aug 5, 2020
  8. Junio C HamanoAug 5, 2020
  9. Sergey OrganovAug 5, 2020
  10. Junio C HamanoAug 5, 2020
  11. Junio C HamanoAug 5, 2020
  12. Sergey OrganovAug 6, 2020
  13. Junio C HamanoAug 6, 2020
  14. Sergey OrganovAug 6, 2020
  15. Sergey OrganovAug 7, 2020
  16. Junio C HamanoAug 17, 2020
  17. Sergey OrganovAug 17, 2020

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.