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, 18:24 UTC
Message-ID
<20200409182455.GA4166316@coredump.intra.peff.net>
In-Reply-To
<63667043-dbca-0092-209d-865c2f60efc8@gmail.com>
On Thu, Apr 09, 2020 at 01:20:57PM -0400, Derrick Stolee wrote:
Show 6 quoted lines
> 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)".

And "something you pulled" is a sensible way to think of that. So --show-pulls makes sense to me. Or if we really want to tie it in to simplification, --no-simplify-pulls. But that's more awkward to type, and none of the existing simplification options use the word simplify. ;)

-Peff
Previous: Derrick StoleeNext: Junio C Hamano
Message 15 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.