From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Richard Stallman Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Wed, 01 Apr 2015 06:22:03 -0400 Message-ID: References: <86egoeusg2.fsf@example.com> <87384qzxqy.fsf@igel.home> <83bnjen71r.fsf@gnu.org> <871tk6538w.fsf@gnu.org> <838ueezgyk.fsf@gnu.org> <878ueejnjz.fsf@uwakimon.sk.tsukuba.ac.jp> <83twx2xoc8.fsf@gnu.org> <87619hke3u.fsf@uwakimon.sk.tsukuba.ac.jp> <551A3F17.6020903@math.ntnu.no> <551A59F1.3060602@math.ntnu.no> <551ABE91.4020408@math.ntnu.no> <83zj6trwss.fsf@gnu.org> <551ACD10.1070600@math.ntnu.no> <83wq1xrtmf.fsf@gnu.org> Reply-To: rms@gnu.org NNTP-Posting-Host: plane.gmane.org Content-Type: text/plain; charset=Utf-8 X-Trace: ger.gmane.org 1427883761 1450 80.91.229.3 (1 Apr 2015 10:22:41 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 1 Apr 2015 10:22:41 +0000 (UTC) Cc: schwab@suse.de, stephen@xemacs.org, hanche@math.ntnu.no, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 01 12:22:27 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 1YdFmi-0003w3-CG for ged-emacs-devel@m.gmane.org; Wed, 01 Apr 2015 12:22:08 +0200 Original-Received: from localhost ([::1]:49595 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdFmh-00026v-N9 for ged-emacs-devel@m.gmane.org; Wed, 01 Apr 2015 06:22:07 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43029) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdFme-00026Y-VD for emacs-devel@gnu.org; Wed, 01 Apr 2015 06:22:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdFme-0003y7-1s for emacs-devel@gnu.org; Wed, 01 Apr 2015 06:22:04 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:53389) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdFmd-0003xy-Vp for emacs-devel@gnu.org; Wed, 01 Apr 2015 06:22:04 -0400 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1YdFmd-0007pO-8p; Wed, 01 Apr 2015 06:22:03 -0400 In-reply-to: <83wq1xrtmf.fsf@gnu.org> (message from Eli Zaretskii on Tue, 31 Mar 2015 19:58:48 +0300) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::e 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:184701 Archived-At: [[[ To any NSA and FBI agents reading my email: please consider ]]] [[[ whether defending the US Constitution against all enemies, ]]] [[[ foreign or domestic, requires you to follow Snowden's example. ]]] > > Are you saying it is better for Richard to do git pull before git > > commit, if he has uncommited changes? > Yes. I think that's what I did, that caused this problem. But I can't remember for certain. It is possible that I had committed all the changes and then did pull. -- Dr Richard Stallman President, Free Software Foundation 51 Franklin St Boston MA 02110 USA www.fsf.org www.gnu.org Skype: No way! See stallman.org/skype.html.