From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Alan Mackenzie Newsgroups: gmane.emacs.devel Subject: Git help requested: "git stash pop" is doing an unwanted "git add". Why? Date: Sun, 20 Dec 2015 22:01:28 +0000 Message-ID: <20151220220127.GB26401@acm.fritz.box> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1450648789 27087 80.91.229.3 (20 Dec 2015 21:59:49 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 20 Dec 2015 21:59:49 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Dec 20 22:59:34 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1aAm0q-0006PE-Aq for ged-emacs-devel@m.gmane.org; Sun, 20 Dec 2015 22:59:32 +0100 Original-Received: from localhost ([::1]:42175 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aAm0p-0001FK-Mp for ged-emacs-devel@m.gmane.org; Sun, 20 Dec 2015 16:59:31 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42747) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aAm0d-0001F2-LP for emacs-devel@gnu.org; Sun, 20 Dec 2015 16:59:20 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aAm0Z-000681-LX for emacs-devel@gnu.org; Sun, 20 Dec 2015 16:59:19 -0500 Original-Received: from mail.muc.de ([193.149.48.3]:15021) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aAm0Z-00067v-F0 for emacs-devel@gnu.org; Sun, 20 Dec 2015 16:59:15 -0500 Original-Received: (qmail 21929 invoked by uid 3782); 20 Dec 2015 21:59:13 -0000 Original-Received: from acm.muc.de (p579E9076.dip0.t-ipconnect.de [87.158.144.118]) by colin.muc.de (tmda-ofmipd) with ESMTP; Sun, 20 Dec 2015 22:59:12 +0100 Original-Received: (qmail 32643 invoked by uid 1000); 20 Dec 2015 22:01:28 -0000 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-Delivery-Agent: TMDA/1.1.12 (Macallan) X-Primary-Address: acm@muc.de X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x X-Received-From: 193.149.48.3 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:196574 Archived-At: Hello, Emacs. I'm clearing out a "stash stack" in my master repository copy. I've just done "git stash pop", expecting git to pop the changes into my working directory. Well, there were 2 files with conflicts - fair enough. But with all the other files, git has had the cheek to do a "git add" (I think the jargon for this is "moved the files to the staging area"), leaving me with the hassle of doing a "git reset" on quite a lot of files. Why has the "git stash pop" done this, and how can I call "git stash pop" in the future, avoiding this annoying problem? -- Alan Mackenzie (Nuremberg, Germany).