From: "Martin Ågren" <martin.agren@gmail.com>
To: Derrick Stolee <stolee@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH v2] rev-list-options.txt: start a list for `show-pulls`
Date: Tue, 26 May 2020 21:20:19 +0200 [thread overview]
Message-ID: <CAN0heSp-D8qfKzDfBYxLA-76v=E_VgKWtfitCFb8DdWiHqMDmw@mail.gmail.com> (raw)
In-Reply-To: <474bbf51-bd40-837a-77de-1688f6488ae3@gmail.com>
On Tue, 26 May 2020 at 19:01, Derrick Stolee <stolee@gmail.com> wrote:
>
> On 5/26/2020 11:16 AM, Junio C Hamano wrote:
> > Martin Ågren <martin.agren@gmail.com> writes:
> >
> > This is not a new issue introduced by this patch, but ...
> >
> >> +--show-pulls::
> >> + In addition to the commits shown in the default history, show
> >> + each merge commit that is not TREESAME to its first parent but
> >> + is TREESAME to a later parent.
> >> +
> >> +When a merge commit is included by `--show-pulls`, the merge is
> >> treated as if it "pulled" the change from another branch. When using
> >> `--show-pulls` on this example (and no other options) the resulting
> >> graph is:
> >
> > ... "is treated AS IF" somewhat made me go "huh?"; with or without
> > the option, the merge did pull the change from another branch,
> > didn't it? The only effect the option has is to make that fact
> > stand out in the output.
>
> I guess the 'as if it "pulled" the change from another branch' sentence
> is literally talking about the "git pull" command, as opposed to the
> "git merge" command, or creating the merge upon completion of a pull request
> on a Git service (which is almost always using libgit2 to generate a merge
> commit).
>
> Perhaps there is no semantic difference between "pulling" and "merging"
> and then this could be reworded to be less awkward.
Agreed on the awkwardness as it stands (before or after this proposed
patch). I don't have any concrete thoughts to offer though.
Martin
prev parent reply other threads:[~2020-05-26 19:20 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-17 18:52 [PATCH 0/7] Documentation fixes for v2.27.0-rc0 Martin Ågren
2020-05-17 18:52 ` [PATCH 1/7] date-formats.txt: fix list continuation Martin Ågren
2020-05-17 18:52 ` [PATCH 2/7] git-bugreport.txt: fix reference to strftime(3) Martin Ågren
2020-05-17 19:23 ` Eric Sunshine
2020-05-17 19:27 ` Martin Ågren
2020-05-18 10:54 ` Jean-Noël Avila
2020-05-18 11:15 ` Martin Ågren
2020-05-17 18:52 ` [PATCH 3/7] git-commit-graph.txt: fix grammo Martin Ågren
2020-05-18 14:46 ` Derrick Stolee
2020-05-17 18:52 ` [PATCH 4/7] git-commit-graph.txt: fix list rendering Martin Ågren
2020-05-17 18:52 ` [PATCH 5/7] git-credential.txt: use list continuation Martin Ågren
2020-05-18 23:06 ` Carlo Marcelo Arenas Belón
2020-05-17 18:52 ` [PATCH 6/7] git-sparse-checkout.txt: add missing ' Martin Ågren
2020-05-18 14:46 ` Derrick Stolee
2020-05-17 18:52 ` [PATCH 7/7] rev-list-options.txt Martin Ågren
2020-05-18 14:57 ` Derrick Stolee
2020-05-18 18:37 ` Martin Ågren
2020-05-18 20:22 ` Junio C Hamano
2020-05-25 17:06 ` [PATCH v2] rev-list-options.txt: start a list for `show-pulls` Martin Ågren
2020-05-26 12:24 ` Derrick Stolee
2020-05-26 19:18 ` Martin Ågren
2020-05-26 15:16 ` Junio C Hamano
2020-05-26 17:01 ` Derrick Stolee
2020-05-26 19:20 ` Martin Ågren [this message]
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='CAN0heSp-D8qfKzDfBYxLA-76v=E_VgKWtfitCFb8DdWiHqMDmw@mail.gmail.com' \
--to=martin.agren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=stolee@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).