From: Chris Torek <chris.torek@gmail.com>
To: Jeff King <peff@peff.net>
Cc: Git List <git@vger.kernel.org>
Subject: Re: [PATCH 2/3] revision: add "--ignore-merges" option to counteract "-m"
Date: Tue, 28 Jul 2020 10:52:14 -0700 [thread overview]
Message-ID: <CAPx1Gvf7d5kdPqYVvruStZuXTySBFZEWMx_1O2MtWJatUM3j+w@mail.gmail.com> (raw)
In-Reply-To: <20200728163853.GB2650252@coredump.intra.peff.net>
First, not that anyone should particularly care: I heartily
approve. :-)
On Tue, Jul 28, 2020 at 9:40 AM Jeff King <peff@peff.net> wrote:
> I pulled the option name from the rev_info field name. It might be too
> broad (we are not ignoring merges during the traversal, only for the
> diff). It could be "--no-diff-merges" or something, but that would
> involve flipping the sense of the boolean (but that would just be in the
> code, not user-visible, so not that big a deal).
Perhaps a bit bikesheddy, but I would suggest some clarifying
notes in the documentation. The fact that `git log` *follows*
merges by default is pretty obvious, but the fact that it doesn't
*diff them at all* by default appears to be surprising to most Git
newcomers. (It was to me, so many years ago, and I see this all
the time on stackoverflow.)
Note that --ignore-merges / --no-ignore-merges affect
only diff generation, not commit traversal. Note
also that by default, "git log -p" does not generate
diffs for merges except when using --first-parent.
See also the -c and --cc options and note that the
default for "git show" is "--cc".
(The "except when using --first-parent" is of course new here.)
This probably needs a bit of tweaking, but the big idea is
to communicate and emphasize three things:
1. "git log -p" and "git show" behave differently by default.
It's a surprise, so we should call it out separately.
2. The default for "git log -p" is no diff at all for merge
commits, so see -c / --cc when you're looking at -m.
3. The default for "git show" is "--cc". (This note doesn't
really belong here; perhaps it should be separately
listed under the -c and --cc options?)
Chris
next prev parent reply other threads:[~2020-07-28 17:52 UTC|newest]
Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-28 16:36 [PATCH 0/3] making --first-parent imply -m Jeff King
2020-07-28 16:36 ` [PATCH 1/3] log: drop "--cc implies -m" logic Jeff King
2020-07-28 16:38 ` [PATCH 2/3] revision: add "--ignore-merges" option to counteract "-m" Jeff King
2020-07-28 17:52 ` Chris Torek [this message]
2020-07-29 18:42 ` Jeff King
2020-07-28 21:01 ` Junio C Hamano
2020-07-29 18:22 ` Jeff King
2020-07-29 18:30 ` Jeff King
2020-07-29 18:53 ` Junio C Hamano
2020-07-28 16:39 ` [PATCH 3/3] log: enable "-m" automatically with "--first-parent" Jeff King
2020-07-28 16:47 ` [PATCH 0/3] making --first-parent imply -m Jeff King
2020-07-28 16:48 ` Junio C Hamano
2020-07-28 16:53 ` Jeff King
2020-07-28 16:55 ` Taylor Blau
2020-07-29 20:10 ` [PATCH v2 0/7] making log " Jeff King
2020-07-29 20:10 ` [PATCH v2 1/7] log: drop "--cc implies -m" logic Jeff King
2020-07-29 20:10 ` [PATCH v2 2/7] revision: add "--no-diff-merges" option to counteract "-m" Jeff King
2020-07-29 20:10 ` [PATCH v2 3/7] log: enable "-m" automatically with "--first-parent" Jeff King
2020-07-29 20:28 ` Junio C Hamano
2020-07-29 20:11 ` [PATCH v2 4/7] doc/git-log: move "Diff Formatting" from rev-list-options Jeff King
2020-07-29 20:56 ` Junio C Hamano
2020-07-29 21:02 ` Jeff King
2020-07-29 20:11 ` [PATCH v2 5/7] doc/git-log: drop "-r" diff option Jeff King
2020-07-29 20:12 ` [PATCH v2 6/7] doc/git-log: move "-t" into diff-options list Jeff King
2020-07-29 21:10 ` Junio C Hamano
2020-07-29 21:55 ` Jeff King
2020-07-29 20:12 ` [PATCH v2 7/7] doc/git-log: clarify handling of merge commit diffs Jeff King
2020-07-29 21:03 ` [PATCH v2 0/7] making log --first-parent imply -m Chris Torek
2020-07-29 21:41 ` Sergey Organov
2020-07-31 23:08 ` Jeff King
2020-08-02 12:59 ` Sergey Organov
2020-08-02 17:35 ` Junio C Hamano
2020-08-03 15:47 ` Sergey Organov
2020-08-03 16:35 ` Junio C Hamano
2020-08-03 16:41 ` Sergey Organov
2020-08-03 17:21 ` Junio C Hamano
2020-08-03 20:25 ` Sergey Organov
2020-08-03 20:58 ` Jeff King
2020-08-03 21:16 ` Sergey Organov
2020-08-03 18:08 ` Jeff King
2020-08-03 20:00 ` Sergey Organov
2020-08-03 20:55 ` Jeff King
2020-08-03 21:18 ` Sergey Organov
2020-08-04 17:50 ` Sergey Organov
2020-08-04 19:42 ` Junio C Hamano
2020-08-04 20:00 ` Jeff King
2020-08-04 20:55 ` Sergey Organov
2020-08-04 21:22 ` Jeff King
2020-08-04 21:55 ` Junio C Hamano
2020-08-04 22:06 ` Sergey Organov
2020-08-04 22:14 ` Jeff King
2020-08-04 22:49 ` Junio C Hamano
2020-08-07 8:26 ` Jeff King
2020-08-07 9:25 ` Sergey Organov
2020-08-07 17:43 ` Junio C Hamano
2020-08-07 17:52 ` Sergey Organov
2020-08-07 19:01 ` Junio C Hamano
2020-08-07 19:12 ` Sergey Organov
2020-08-07 19:20 ` Jeff King
2020-08-07 19:28 ` Sergey Organov
2020-08-07 19:46 ` Junio C Hamano
2020-08-07 20:29 ` Sergey Organov
2020-08-07 20:39 ` Junio C Hamano
2020-08-07 21:08 ` Sergey Organov
2020-08-07 21:54 ` Junio C Hamano
2020-08-07 23:07 ` Sergey Organov
2020-08-04 22:53 ` Sergey Organov
2020-08-04 21:21 ` Sergey Organov
2020-08-04 21:26 ` Jeff King
2020-08-04 19:58 ` Jeff King
2020-08-04 20:56 ` Sergey Organov
2020-08-04 21:25 ` Jeff King
2020-08-04 21:41 ` Sergey Organov
2020-08-04 22:07 ` Jeff King
2020-08-04 22:15 ` Sergey Organov
2020-08-04 21:27 ` Junio C Hamano
2020-08-04 21:44 ` Sergey Organov
2020-08-04 21:58 ` Sergey Organov
2020-08-04 22:08 ` Jeff King
2020-08-04 22:26 ` [PATCH] revision: fix die() message for "--unpacked=" Sergey Organov
2020-08-05 0:03 ` Junio C Hamano
2020-08-05 15:37 ` [PATCH v2 0/7] making log --first-parent imply -m Sergey Organov
2020-08-05 16:05 ` Junio C Hamano
2020-08-05 17:55 ` Sergey Organov
2020-08-05 19:24 ` Junio C Hamano
2020-08-05 20:27 ` Sergey Organov
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=CAPx1Gvf7d5kdPqYVvruStZuXTySBFZEWMx_1O2MtWJatUM3j+w@mail.gmail.com \
--to=chris.torek@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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).