From: Sergey Organov <sorganov@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Oct 2023, #01; Mon, 2)
Date: Tue, 03 Oct 2023 10:01:02 +0300 [thread overview]
Message-ID: <871qecgpg1.fsf@osv.gnss.ru> (raw)
In-Reply-To: <xmqqedic35u4.fsf@gitster.g> (Junio C. Hamano's message of "Mon, 02 Oct 2023 17:30:43 -0700")
Junio C Hamano <gitster@pobox.com> writes:
[...]
> * so/diff-merges-d (2023-09-11) 2 commits
> - diff-merges: introduce '-d' option
> - diff-merges: improve --diff-merges documentation
>
> Teach a new "-d" option that shows the patch against the first
> parent for merge commits (which is "--diff-merges=first-parent -p").
Which happens to naturally mean "show diff for all commits" for the
user.
>
> Letting a less useful combination of options squat on short-and-sweet
> "-d" feels dubious. source:
> <20230909125446.142715-1-sorganov@gmail.com>
I believe I've addressed this in details in my reply here:
<87o7hok8dx.fsf@osv.gnss.ru>, and got no further objections from you
since then, so I figure I'd ask to finally let the patch in.
To summarize my position here, "-d" meaning "show me *d*iff for all
commits", as implemented in the patch, is very mnemonic, has natural
semantics for "-d" in the context of "git log", and is straight to the
point. Therefore it is indeed short-and-sweet compared to the only
alternative proposed: "follow first parent only while traversing history
and show me diffs for all commits", that would indeed need a different
short-cut, if any.
Thanks,
-- Sergey Organov
next prev parent reply other threads:[~2023-10-03 7:03 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-03 0:30 What's cooking in git.git (Oct 2023, #01; Mon, 2) Junio C Hamano
2023-10-03 7:01 ` Sergey Organov [this message]
2023-10-03 16:33 ` Junio C Hamano
2023-10-03 17:59 ` Sergey Organov
2023-10-04 8:20 ` Junio C Hamano
2023-10-04 11:18 ` Sergey Organov
2023-10-05 10:25 ` Junio C Hamano
2023-10-05 20:59 ` Sergey Organov
2023-10-05 21:47 ` Junio C Hamano
2023-10-06 18:02 ` Sergey Organov
2023-10-04 1:20 ` Eric W. Biederman
2023-10-04 16:28 ` 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=871qecgpg1.fsf@osv.gnss.ru \
--to=sorganov@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).