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

Re: [PATCH] revision: --include-diversions adds helpful merges

From
Jeff King <peff@peff.net>
Date
Apr 9, 2020, 19:21 UTC
Message-ID
<20200409192149.GA4168991@coredump.intra.peff.net>
In-Reply-To
<xmqq369co5e0.fsf@gitster.c.googlers.com>
On Thu, Apr 09, 2020 at 11:55:51AM -0700, Junio C Hamano wrote:
Show 14 quoted lines
> > On Thu, Apr 09, 2020 at 01:20:57PM -0400, Derrick Stolee wrote:
> >
> >> In conclusion, I think "--show-pulls" provides the right context for these
> >> extra merges to show in the history view. It also roots these merges in a
> >> Git-native name (that also happens to evoke the "pull request" concept that
> >> is _not_ native to Git).
> >> 
> >> What do you think?
> >
> > Yeah, after reading more of the thread, I think the simplest way to
> > think about is "keep merges that pulled in something" with the
> > implication of "(even if the other side didn't touch anything)".
> 
> Isn't it more like "even if our side didn't touch anything", though?

I meant the _other_ other. :) I.e., the other one that is not what just got pulled in. Which is the first parent. ;)

So yes, I think we are on the same page, and I just said it badly. Using "our side" is better than trying to double-negate "other".

-Peff
Previous: Junio C HamanoNext: brian m. carlson
Message 17 of 23 in “revision: --include-diversions adds helpful merges”
  1. revision: --include-diversions adds helpful mergesDerrick Stolee via GitGitGadget, Apr 8, 2020
  2. Junio C HamanoApr 8, 2020
  3. Derrick StoleeApr 8, 2020
  4. Derrick StoleeApr 8, 2020
  5. Junio C HamanoApr 8, 2020
  6. Jeff KingApr 8, 2020
  7. Derrick StoleeApr 8, 2020
  8. Junio C HamanoApr 8, 2020
  9. Derrick StoleeApr 8, 2020
  10. Junio C HamanoApr 9, 2020
  11. Derrick StoleeApr 9, 2020
  12. Philip OakleyApr 9, 2020
  13. Junio C HamanoApr 9, 2020
  14. Derrick StoleeApr 9, 2020
  15. Jeff KingApr 9, 2020
  16. Junio C HamanoApr 9, 2020
  17. Jeff KingApr 9, 2020
  18. brian m. carlsonApr 8, 2020
  19. Jeff KingApr 8, 2020
  20. revision: --include-diversions adds helpful mergesDerrick Stolee via GitGitGadget, Apr 9, 2020
  21. revision: --show-pulls adds helpful mergesDerrick Stolee via GitGitGadget, Apr 10, 2020
  22. Junio C HamanoApr 10, 2020
  23. Derrick StoleeApr 10, 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.