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

Re: 2.43+ git checkout --theirs on stash error - no alternative?

From
Taylor Blau <me@ttaylorr.com>
Date
Oct 27, 2024, 23:38 UTC
Message-ID
<Zx7O3VsZX2B9d9qN@nand.local>
In-Reply-To
<CANM0SV0Muk8KT6Mv=14ui07c6OzaNDDQwg2bUVRb8JyJWTyHnQ@mail.gmail.com>
On Sun, Oct 27, 2024 at 11:31:05PM +0100, Devste Devste wrote:
> Turns out the previous behavior can be achieved with
> git restore --source='stash@{0}' -- "some-file.txt"

Hmm. What you wrote above here makes sense, but I agree with the original change from Junio (CC'd) that using `--theirs` does not make sense when the source is a tree-ish and not the index directly.

This is different, though, since here you are just trying to check out the contents of some-file.txt at stash@{0}, without `--theirs`. What did you mean in the previous example, and why was `--theirs` necessary in the call there?

Thanks, Taylor

Previous: Devste DevsteNext: Devste Devste
Message 3 of 6 in “2.43+ git checkout --theirs on stash error - no alternative?”
  1. Devste DevsteOct 27, 2024
  2. Devste DevsteOct 27, 2024
  3. Taylor BlauOct 27, 2024
  4. Devste DevsteNov 4, 2024
  5. Junio C HamanoNov 4, 2024
  6. Devste DevsteNov 6, 2024

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.