From: Phillip Susi <psusi@ubuntu.com>
To: git@vger.kernel.org
Subject: stash refuses to pop
Date: Tue, 10 Apr 2012 13:52:16 -0400 [thread overview]
Message-ID: <4F847350.3000409@ubuntu.com> (raw)
git stash refuses to apply a stash if it touches files that are
modified. Using stash -p to selectively stash some hunks of a file and
then immediately trying to pop that stash causes this failure every
time. This seems incredibly broken, and there does not seem to be a
force switch. How can you get the stash applied?
next reply other threads:[~2012-04-10 17:52 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-10 17:52 Phillip Susi [this message]
2012-04-10 18:05 ` stash refuses to pop Junio C Hamano
2012-04-10 18:56 ` Phillip Susi
2012-04-11 2:47 ` Andrew Ardill
2012-04-11 2:59 ` Phillip Susi
2012-04-14 4:27 ` Andreas Krey
2012-04-14 10:12 ` Jakub Narebski
2012-04-16 1:29 ` Phillip Susi
2012-04-11 7:15 ` Victor Engmark
2012-04-11 5:58 ` Johannes Sixt
2012-04-11 14:21 ` Phillip Susi
2012-04-12 5:50 ` Johannes Sixt
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=4F847350.3000409@ubuntu.com \
--to=psusi@ubuntu.com \
--cc=git@vger.kernel.org \
/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).