From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?iso-8859-1?Q?Renaud_Casenave-P=E9r=E9?= Newsgroups: gmane.emacs.devel Subject: Re: Git help requested: "git stash pop" is doing an unwanted "git add". Why? Date: Tue, 22 Dec 2015 17:11:44 +0100 Message-ID: References: <20151220220127.GB26401@acm.fritz.box> <83y4coscd1.fsf@gnu.org> <20151221202621.GB14142@acm.fritz.box> <87egeexzqy.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1450803085 19822 80.91.229.3 (22 Dec 2015 16:51:25 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 22 Dec 2015 16:51:25 +0000 (UTC) Cc: Alan Mackenzie , Eli Zaretskii , emacs-devel@gnu.org To: Mike Gerwitz Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Dec 22 17:51:15 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 1aBQ9a-000536-CE for ged-emacs-devel@m.gmane.org; Tue, 22 Dec 2015 17:51:14 +0100 Original-Received: from localhost ([::1]:51635 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBQ9Z-0002Z4-St for ged-emacs-devel@m.gmane.org; Tue, 22 Dec 2015 11:51:13 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60405) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBQ9G-0002GT-8R for emacs-devel@gnu.org; Tue, 22 Dec 2015 11:50:55 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aBQ9F-0008VF-5Q for emacs-devel@gnu.org; Tue, 22 Dec 2015 11:50:54 -0500 Original-Received: from 195-154-166-101.rev.poneytelecom.eu ([195.154.166.101]:36357 helo=casenave-pere.fr) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBQ98-0008To-Rk; Tue, 22 Dec 2015 11:50:46 -0500 Original-Received: from MRC-WKS-060246 (195-154-112-158.rev.poneytelecom.eu [195.154.112.158]) (Authenticated sender: raz) by casenave-pere.fr (Postfix) with ESMTPSA id 724FAC7BE4; Tue, 22 Dec 2015 17:11:45 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=casenave-pere.fr; s=default; t=1450800705; bh=FwmwyhHEYbpjSWCCroovAZBOyIehBfcPKGfrUfu9RrI=; h=From:To:Cc:Subject:References:Date:In-Reply-To:From; b=pszYzWgpnyJO/XEtddyDCCFwN3C9HHIbD2LgpsZ9Jd2y8r5WJAhYOUWBjC2XpyXOt X3YsejzYQkayTDgQTGIz0VO9RHio+6zq333/Aux2skWRylHYLB1c/7XxK83jhv4ISR tuRAAlx2XFeeeogE78lquGvYHHXSo0+m/qe2fWZE= In-Reply-To: <87egeexzqy.fsf@gnu.org> (Mike Gerwitz's message of "Tue, 22 Dec 2015 10:35:33 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (windows-nt) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 195.154.166.101 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:196677 Archived-At: In my experience, if some files are in conflict, git will add to index all non-conflicting files to clearly separate the conflicting ones. You are then expected to resolve the conflicts, stage the files to tell git= to accept the resolved files, and do a git reset to put everything back in the working area. I think this is something that is not (properly) documented and quite confu= sing but when you know what to do, you get used to it=E2=80=A6 --=20 Renaud Casenave-P=C3=A9r=C3=A9