From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Miles Bader Newsgroups: gmane.emacs.devel Subject: Re: C-x v u for added files in vc-git Date: Fri, 04 Dec 2009 12:39:03 +0900 Message-ID: References: <200912030606.nB366cKS021507@godzilla.ics.uci.edu> <20091203090205.8k74zmgqe8ko8k8o@webmail.mnet-online.de> <200912030909.nB3993lF022865@godzilla.ics.uci.edu> <20091203131514.cq73r2k3cwso8sow@webmail.mnet-online.de> <200912031822.nB3IMZt0027156@godzilla.ics.uci.edu> Reply-To: Miles Bader NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1259897976 20177 80.91.229.12 (4 Dec 2009 03:39:36 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 4 Dec 2009 03:39:36 +0000 (UTC) Cc: mathias@mnet-mail.de, emacs-devel@gnu.org To: Dan Nicolaescu Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Dec 04 04:39:29 2009 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1NGP0y-0002vC-Np for ged-emacs-devel@m.gmane.org; Fri, 04 Dec 2009 04:39:28 +0100 Original-Received: from localhost ([127.0.0.1]:42390 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NGP0y-0005mQ-6v for ged-emacs-devel@m.gmane.org; Thu, 03 Dec 2009 22:39:28 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NGP0l-0005du-El for emacs-devel@gnu.org; Thu, 03 Dec 2009 22:39:15 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NGP0g-0005XY-5q for emacs-devel@gnu.org; Thu, 03 Dec 2009 22:39:14 -0500 Original-Received: from [199.232.76.173] (port=54093 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NGP0g-0005XO-1V for emacs-devel@gnu.org; Thu, 03 Dec 2009 22:39:10 -0500 Original-Received: from tyo202.gate.nec.co.jp ([202.32.8.206]:56347) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NGP0c-0001Gk-Nb; Thu, 03 Dec 2009 22:39:07 -0500 Original-Received: from relay31.aps.necel.com ([10.29.19.54]) by tyo202.gate.nec.co.jp (8.13.8/8.13.4) with ESMTP id nB43d3Ks029815; Fri, 4 Dec 2009 12:39:03 +0900 (JST) Original-Received: from relay31.aps.necel.com ([10.29.19.16] [10.29.19.16]) by relay31.aps.necel.com with ESMTP; Fri, 4 Dec 2009 12:39:03 +0900 Original-Received: from dhlpc061 ([10.114.114.153] [10.114.114.153]) by relay31.aps.necel.com with ESMTP; Fri, 4 Dec 2009 12:39:03 +0900 Original-Received: by dhlpc061 (Postfix, from userid 31295) id 74BD752E1F9; Fri, 4 Dec 2009 12:39:03 +0900 (JST) System-Type: x86_64-unknown-linux-gnu Blat: Foop In-Reply-To: <200912031822.nB3IMZt0027156@godzilla.ics.uci.edu> (Dan Nicolaescu's message of "Thu, 3 Dec 2009 10:22:35 -0800 (PST)") Original-Lines: 22 X-detected-operating-system: by monty-python.gnu.org: Solaris 8 (1) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:118230 Archived-At: Dan Nicolaescu writes: > 3. is exactly the goal for the command, to get rid of unwanted changes! > > So it seems that if we do the sequence: > > git checkout HEAD > git rm --cached > > that take care of all situations. I don't know _what_ people expect "C-x v u" to do for files that were never committed, .... but the above sequence (specifically, the "git co") seems to reset the file's contents to the contents it had at the time it was added with "git add", in addition to removing it from the list of added files. [What happens with CVS?] -Miles -- Everywhere is walking distance if you have the time. -- Steven Wright