git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Taylor Blau <me@ttaylorr.com>
To: Devste Devste <devstemail@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: 2.43+ git checkout --theirs on stash error - no alternative?
Date: Sun, 27 Oct 2024 19:38:05 -0400	[thread overview]
Message-ID: <Zx7O3VsZX2B9d9qN@nand.local> (raw)
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

  reply	other threads:[~2024-10-27 23:38 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-27 22:16 2.43+ git checkout --theirs on stash error - no alternative? Devste Devste
2024-10-27 22:31 ` Devste Devste
2024-10-27 23:38   ` Taylor Blau [this message]
2024-11-04 10:09     ` Devste Devste
2024-11-04 10:17       ` Junio C Hamano
2024-11-06 10:16         ` Devste Devste

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=Zx7O3VsZX2B9d9qN@nand.local \
    --to=me@ttaylorr.com \
    --cc=devstemail@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).