From: Josh Triplett <josh@joshtriplett.org>
To: git@vger.kernel.org
Subject: Can't git stash after using git add -N
Date: Tue, 15 Mar 2016 16:07:54 -0700 [thread overview]
Message-ID: <20160315230754.GA12058@cloud> (raw)
After using "git add -N", "git stash" can no longer stash:
/tmp/temp$ git init
Initialized empty Git repository in /tmp/temp/.git/
/tmp/temp$ echo a > a
/tmp/temp$ git add a
/tmp/temp$ git commit -m 'Initial commit of a'
[master (root-commit) d7242c4] Initial commit of a
1 file changed, 1 insertion(+)
create mode 100644 a
/tmp/temp$ echo b > b
/tmp/temp$ git add -N b
/tmp/temp$ git stash
error: Entry 'b' not uptodate. Cannot merge.
Cannot save the current worktree state
- Josh Triplett
next reply other threads:[~2016-03-15 23:08 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-15 23:07 Josh Triplett [this message]
2016-03-15 23:46 ` Can't git stash after using git add -N Junio C Hamano
2016-03-16 2:00 ` Josh Triplett
2016-03-16 4:51 ` Junio C Hamano
2016-03-16 11:09 ` Duy Nguyen
2016-03-16 12:02 ` Josh Triplett
2016-03-16 21:05 ` Jeff King
2016-03-16 21:11 ` Junio C Hamano
2016-03-16 21:18 ` Jeff King
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=20160315230754.GA12058@cloud \
--to=josh@joshtriplett.org \
--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 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.