git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Alan Mackenzie <acm@muc.de>
To: git@vger.kernel.org
Subject: "git stash pop" is doing an unwanted "git add" when there are conflicts.
Date: Mon, 21 Dec 2015 14:29:54 +0000	[thread overview]
Message-ID: <20151221142953.GA12764@acm.fritz.box> (raw)

Hello, git project.

Last night, whilst clearing out a stale "stash stack", I did "git stash
pop".  There were conflicts in two files.

However, all the popped files became staged.  This doesn't normally happen.
It was intensely irritating, and required me to do "git reset HEAD" on
each of the files, none of which I wanted to commit.

I searched the git-stash man page for this scenario, but found nothing
about it.

Surely staging all the files is a bug?

-- 
Alan Mackenzie (Nuremberg, Germany).

             reply	other threads:[~2015-12-21 14:34 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-21 14:29 Alan Mackenzie [this message]
2015-12-21 20:34 ` "git stash pop" is doing an unwanted "git add" when there are conflicts Alan Mackenzie
2015-12-22  8:17 ` Dennis Kaarsemaker
2015-12-22  9:30   ` Jeff King
2015-12-24  9:20     ` Alan Mackenzie
2015-12-29  7:53       ` Jeff King
2015-12-29 19:04         ` Junio C Hamano
2015-12-30  7:13           ` Jeff King
2015-12-29 21:20         ` Alan Mackenzie
2015-12-30  7:02           ` 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

  List information: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to=20151221142953.GA12764@acm.fritz.box \
    --to=acm@muc.de \
    --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. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).