From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Steinar Bang Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Mon, 06 Apr 2015 08:54:15 +0200 Organization: Probably a good idea Message-ID: <86bnj17nmw.fsf@dod.no> References: <5511998E.8080309@cs.ucla.edu> <5512F8C7.7010509@math.ntnu.no> <5513F889.4000404@math.ntnu.no> <552102D6.1030106@math.ntnu.no> <552194A9.20005@math.ntnu.no> <552198A9.8060009@math.ntnu.no> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1428303329 21360 80.91.229.3 (6 Apr 2015 06:55:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 6 Apr 2015 06:55:29 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Apr 06 08:55: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 1Yf0wD-0004Uf-Vs for ged-emacs-devel@m.gmane.org; Mon, 06 Apr 2015 08:55:14 +0200 Original-Received: from localhost ([::1]:38683 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yf0wD-0004sp-5H for ged-emacs-devel@m.gmane.org; Mon, 06 Apr 2015 02:55:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35156) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yf0w9-0004oa-FY for emacs-devel@gnu.org; Mon, 06 Apr 2015 02:55:10 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yf0w6-0000MB-Af for emacs-devel@gnu.org; Mon, 06 Apr 2015 02:55:09 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:35852) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yf0w6-0000KK-4U for emacs-devel@gnu.org; Mon, 06 Apr 2015 02:55:06 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Yf0w4-0004Ox-2x for emacs-devel@gnu.org; Mon, 06 Apr 2015 08:55:04 +0200 Original-Received: from cm-84.208.248.210.getinternet.no ([84.208.248.210]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 06 Apr 2015 08:55:04 +0200 Original-Received: from sb by cm-84.208.248.210.getinternet.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 06 Apr 2015 08:55:04 +0200 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 10 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: cm-84.208.248.210.getinternet.no Mail-Copies-To: never User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.4 (windows-nt) Cancel-Lock: sha1:YS9fN9cCUz7AVUqOL0j+bHk0r38= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.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:185004 Archived-At: >>>>> Richard Stallman : > This means that you can't undo 'git stash pop' with 'git stash'. > 'git stash pop' is therefore a risky thing to do. Not really. If "git stash pop" fails, git will leave the stash in place. So if you reset your workspace with "git reset --hard HEAD" the stash will still be there (and will still fail when applied, because of conflicts).