From: Junio C Hamano <gitster@pobox.com>
To: Sergey Organov <sorganov@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Aug 2020, #02; Mon, 10)
Date: Tue, 11 Aug 2020 12:23:59 -0700 [thread overview]
Message-ID: <xmqq7du59eb4.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <874kp9biho.fsf@osv.gnss.ru> (Sergey Organov's message of "Tue, 11 Aug 2020 13:10:43 +0300")
Sergey Organov <sorganov@gmail.com> writes:
> Junio C Hamano <gitster@pobox.com> writes:
>
> [...]
>
>> * jk/log-fp-implies-m (2020-07-29) 7 commits
>> (merged to 'next' on 2020-08-03 at 39fefa6b82)
>> + doc/git-log: clarify handling of merge commit diffs
>> + doc/git-log: move "-t" into diff-options list
>> + doc/git-log: drop "-r" diff option
>> + doc/git-log: move "Diff Formatting" from rev-list-options
>> + log: enable "-m" automatically with "--first-parent"
>> + revision: add "--no-diff-merges" option to counteract "-m"
>> + log: drop "--cc implies -m" logic
>>
>> Originally merged to 'next' on 2020-08-01
>>
>> "git log --first-parent -p" showed patches only for single-parent
>> commits on the first-parent chain; the "--first-parent" option has
>> been made to imply "-m". Use "--no-diff-merges" to restore the
>> previous behaviour to omit patches for merge commits.
>>
>> On hold a bit.
>> cf. <20200804200018.GB2014743@coredump.intra.peff.net>
>
> I believe I've submitted resolution for that.
>
> <20200805220832.3800-1-sorganov@gmail.com>
>
> Do you expect anything from me to push all this further?
I was waiting for a reroll of the "resolution" with just one extra
test I mentioned in <xmqq3650n2rc.fsf@gitster.c.googlers.com> in the
thread. With that everything would be good to go, I would think.
next prev parent reply other threads:[~2020-08-11 19:24 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-10 19:44 What's cooking in git.git (Aug 2020, #02; Mon, 10) Junio C Hamano
2020-08-11 5:01 ` Eric Sunshine
2020-08-11 19:24 ` Junio C Hamano
2020-08-11 6:53 ` Jeff King
2020-08-11 9:33 ` Patrick Steinhardt
2020-08-11 9:59 ` brian m. carlson
2020-08-11 10:10 ` Sergey Organov
2020-08-11 19:23 ` Junio C Hamano [this message]
2020-08-11 19:34 ` Sergey Organov
2020-08-11 20:17 ` Sergey Organov
2020-08-11 21:36 ` Junio C Hamano
2020-08-12 8:15 ` Sergey Organov
2020-08-11 20:28 ` Junio C Hamano
2020-08-11 21:26 ` Sergey Organov
2020-08-11 22:12 ` Junio C Hamano
2020-08-11 13:48 ` Taylor Blau
2020-08-11 14:27 ` Matheus Tavares Bernardino
2020-08-11 19:20 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq7du59eb4.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=sorganov@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).