From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Tue, 31 Mar 2015 15:33:22 +0300 Message-ID: <83h9t1tkh9.fsf@gnu.org> References: <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> <20150331085055.GA2871@acm.fritz.box> <87zj6tiko1.fsf@uwakimon.sk.tsukuba.ac.jp> <20150331104935.GB2871@acm.fritz.box> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1427805263 25619 80.91.229.3 (31 Mar 2015 12:34:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 31 Mar 2015 12:34:23 +0000 (UTC) Cc: acm@muc.de, stephen@xemacs.org, hanche@math.ntnu.no, rms@gnu.org, emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 31 14:34:12 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 1YcvMi-0002YZ-B6 for ged-emacs-devel@m.gmane.org; Tue, 31 Mar 2015 14:33:56 +0200 Original-Received: from localhost ([::1]:38519 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcvMh-00071p-MF for ged-emacs-devel@m.gmane.org; Tue, 31 Mar 2015 08:33:55 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52890) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcvMU-00071k-Ro for emacs-devel@gnu.org; Tue, 31 Mar 2015 08:33:43 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YcvMP-0003Fa-08 for emacs-devel@gnu.org; Tue, 31 Mar 2015 08:33:42 -0400 Original-Received: from mtaout29.012.net.il ([80.179.55.185]:35248) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcvMO-0003F7-Oa; Tue, 31 Mar 2015 08:33:36 -0400 Original-Received: from conversion-daemon.mtaout29.012.net.il by mtaout29.012.net.il (HyperSendmail v2007.08) id <0NM200F00TB6V700@mtaout29.012.net.il>; Tue, 31 Mar 2015 15:30:52 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout29.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NM200DLDTFGXO20@mtaout29.012.net.il>; Tue, 31 Mar 2015 15:30:52 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.185 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:184611 Archived-At: > From: Andreas Schwab > Date: Tue, 31 Mar 2015 13:02:05 +0200 > Cc: "Stephen J. Turnbull" , > Harald Hanche-Olsen , rms@gnu.org, emacs-devel@gnu.org > > Alan Mackenzie writes: > > > With git pull, if there are changes in the working directory, the merge > > (i.e. merge from remote/master into master) part of the operation is > > aborted before it starts, giving a message describing its refusal. It > > does this even when there are no conflicts to deal with. > > Only if you use --rebase. Perhaps Alan has that in his .gitconfig?