From: Kirill Likhodedov <klikh.list@gmail.com>
To: git@vger.kernel.org
Subject: Re: git stash show doesn't show stashed untracked files
Date: Mon, 31 Oct 2011 11:36:38 +0300 [thread overview]
Message-ID: <503C659A-47BA-4DEA-8EA8-D2B46C2BBF59@gmail.com> (raw)
In-Reply-To: <5284251B-7265-493B-981D-DD10B80F85B1@jetbrains.com>
Resending: it seems that the message was lost in discussions.
>
> Git 1.7.7 introduced a very useful feature - stashing untracked files via "-u" option.
>
> However, there is a problems with it:
> 'git stash show' doesn't show stashed untracked files.
>
> # git version
> git version 1.7.7
> # touch untracked.txt
> # git stash save -u
> # git stash show // no output
>
> If changes in tracked files are stashed along with untracked files, then only tracked changes are shown in "git stash show" output.
>
> Moreover, if I have the same file in the working tree, I wouldn't be able to 'git stash pop':
> # git stash pop -v
> untracked.txt already exists, no checkout
> Could not restore untracked files from stash
>
> In this case the only way to access the stashed content is to remove the tracked file and pop the stash again.
>
prev parent reply other threads:[~2011-10-31 8:43 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-25 13:21 git stash show doesn't show stashed untracked files Kirill Likhodedov
2011-10-31 8:36 ` Kirill Likhodedov [this message]
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=503C659A-47BA-4DEA-8EA8-D2B46C2BBF59@gmail.com \
--to=klikh.list@gmail.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).