From: Steven Grimm <koreth@midwinter.com>
To: Johannes Sixt <j.sixt@viscovery.net>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: git stash apply usability issues
Date: Thu, 18 Oct 2007 07:12:35 -0700 [thread overview]
Message-ID: <471769D3.4080908@midwinter.com> (raw)
In-Reply-To: <47171A21.9030003@viscovery.net>
Johannes Sixt wrote:
> (2) when 'git stash apply' runs merge-recursive, it treats the current
> state as 'ours' and the stash as 'theirs'. IMHO it should be the other
> way round: I have stashed away changes to a binary file. Then
> committed a different modification to it, and now want to apply the
> stash. This results in a conflict that leaves the current state in the
> working tree, but I had preferred that the stashed binary file were in
> the working tree now.
>
> What do other git-stash users think about changing the order?
Seems right to me. I'd expect to get the stashed version in the working
tree in that case.
-Steve
next prev parent reply other threads:[~2007-10-18 14:12 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-18 8:32 git stash apply usability issues Johannes Sixt
2007-10-18 14:12 ` Steven Grimm [this message]
2007-10-19 1:31 ` Shawn O. Pearce
2007-10-19 13:27 ` Karl Hasselström
2007-10-19 13:57 ` David Kastrup
2007-10-19 1:33 ` [PATCH] Avoid invoking diff drivers during git-stash Shawn O. Pearce
2007-10-19 6:08 ` Johannes Sixt
2007-10-19 6:13 ` Shawn O. Pearce
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=471769D3.4080908@midwinter.com \
--to=koreth@midwinter.com \
--cc=git@vger.kernel.org \
--cc=j.sixt@viscovery.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.