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

Re: [PATCH] restore: fault --staged --worktree with merge opts

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 22, 2023, 23:09 UTC
Message-ID
<xmqq356xcn5z.fsf@gitster.g>
In-Reply-To
<CAHWeT-Zy=iJZoVAWZHqnGGFb-KMbg1fk_mmdE2T=K4+xRHpG0A@mail.gmail.com>
Andy Koppe <andy.koppe@gmail.com> writes:
Show 7 quoted lines
> On Tue, 21 Feb 2023 at 18:38, Junio C Hamano wrote:
>>         Side note 2: it is conceivable that --worktree --staged
>>         --ours may want to (1) resolve the conflicted path to stage
>>         #2 in the index and (2) check out the result in the working
>>         tree.
>
> Same with restore --worktree --staged --theirs and stage #3?

These two work pretty much symmetrical, so the same story should apply there, I would think.

> Thank you very much for the thorough review. I'll prepare a new
> version of the patch.
Thanks.
Previous: Andy KoppeNext: Andy Koppe
Message 4 of 6 in “restore: fault --staged --worktree with merge opts”
  1. restore: fault --staged --worktree with merge optsAndy Koppe, Feb 18, 2023
  2. Junio C HamanoFeb 21, 2023
  3. Andy KoppeFeb 21, 2023
  4. Junio C HamanoFeb 22, 2023
  5. restore: fault --staged --worktree with merge optsAndy Koppe, Feb 26, 2023
  6. Junio C HamanoFeb 28, 2023

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.