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

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

From
Philip Oakley <philipoakley@iee.email>
Date
Apr 9, 2020, 14:28 UTC
Message-ID
<7d84fc45-786f-7a2e-5889-ef26916627ef@iee.email>
In-Reply-To
<xmqqimi9o705.fsf@gitster.c.googlers.com>
Hi
On 09/04/2020 01:08, Junio C Hamano wrote:
Show 21 quoted lines
> Derrick Stolee <stolee@gmail.com> writes:
>
>>>> In my latest attempt at documentation, I called these merges "diverters"
>>>> yet still used "--include-diversions". Here are a few other words that we
>>>> could use:
>>>>
>>>>  * diverters or diversions
>>>>  * redirects
>>>>  * switches (think railroad switch). Synonym: exchange
>>>>  * detours
>>> ...none of the above tells me that they are not no-op (in other
>>> words, they do something meaningful), so I must be coming from
>>> a direction different from you are.  What redirects from what other
>>> thing, for example?
>> The merges do something meaningful: they "merge in" a "real" change.
> Yes, but "redirect", "switch", "detour", or "divert" do not quite
> mean "merging in a real change", at least to me.
>
>> I'll just submit my v2 as-is, which includes a significant change to
>> the documentation that should make things more clear.
> Thanks.

Can I suggest "--side-merges" as a possible descriptor for these non-mainline diversions?

My thesaurus had suggested detour and sidetracked, which led to the side-merge view.

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