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

Re: [PATCH v2] rev-list-options.txt: start a list for `show-pulls`

From
MÅMartin Ågren <martin.agren@gmail.com>
Date
May 26, 2020, 19:20 UTC
Message-ID
<CAN0heSp-D8qfKzDfBYxLA-76v=E_VgKWtfitCFb8DdWiHqMDmw@mail.gmail.com>
In-Reply-To
<474bbf51-bd40-837a-77de-1688f6488ae3@gmail.com>
On Tue, 26 May 2020 at 19:01, Derrick Stolee <stolee@gmail.com> wrote:
Show 29 quoted lines
>
> 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
Previous: Derrick Stolee
Message 24 of 24 in “Documentation fixes for v2.27.0-rc0”
  1. 0/7 Documentation fixes for v2.27.0-rc0Martin Ågren, May 17, 2020
  2. 1/7 date-formats.txt: fix list continuationMartin Ågren, May 17, 2020
  3. 2/7 git-bugreport.txt: fix reference to strftime(3)Martin Ågren, May 17, 2020
  4. Eric SunshineMay 17, 2020
  5. Martin ÅgrenMay 17, 2020
  6. Jean-Noël AvilaMay 18, 2020
  7. Martin ÅgrenMay 18, 2020
  8. 3/7 git-commit-graph.txt: fix grammoMartin Ågren, May 17, 2020
  9. Derrick StoleeMay 18, 2020
  10. 4/7 git-commit-graph.txt: fix list renderingMartin Ågren, May 17, 2020
  11. 5/7 git-credential.txt: use list continuationMartin Ågren, May 17, 2020
  12. Carlo Marcelo Arenas BelónMay 18, 2020
  13. 6/7 git-sparse-checkout.txt: add missing 'Martin Ågren, May 17, 2020
  14. Derrick StoleeMay 18, 2020
  15. 7/7 rev-list-options.txtMartin Ågren, May 17, 2020
  16. Derrick StoleeMay 18, 2020
  17. Martin ÅgrenMay 18, 2020
  18. Junio C HamanoMay 18, 2020
  19. rev-list-options.txt: start a list for `show-pulls`Martin Ågren, May 25, 2020
  20. Derrick StoleeMay 26, 2020
  21. Martin ÅgrenMay 26, 2020
  22. Junio C HamanoMay 26, 2020
  23. Derrick StoleeMay 26, 2020
  24. Martin ÅgrenMay 26, 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.