From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Harald Hanche-Olsen Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Wed, 01 Apr 2015 08:18:56 +0200 Message-ID: <551B8DD0.1010800@math.ntnu.no> References: <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> <86ego5cp95.fsf@dod.no> <20150331154839.GE2871@acm.fritz.box> <87pp7phxt1.fsf@uwakimon.sk.tsukuba.ac.jp> <20150331204609.GG2871@acm.fritz.box> <87k2xwj11j.fsf@uwakimon.sk.tsukuba.ac.jp> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1427869179 2151 80.91.229.3 (1 Apr 2015 06:19:39 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 1 Apr 2015 06:19:39 +0000 (UTC) Cc: Alan Mackenzie , emacs-devel@gnu.org To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 01 08:19:30 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 1YdBzr-0001AQ-Jp for ged-emacs-devel@m.gmane.org; Wed, 01 Apr 2015 08:19:27 +0200 Original-Received: from localhost ([::1]:41704 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdBzq-0000b9-Qv for ged-emacs-devel@m.gmane.org; Wed, 01 Apr 2015 02:19:26 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35100) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdBzc-0000ak-AP for emacs-devel@gnu.org; Wed, 01 Apr 2015 02:19:13 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdBzZ-0005QN-42 for emacs-devel@gnu.org; Wed, 01 Apr 2015 02:19:12 -0400 Original-Received: from hylle05.itea.ntnu.no ([129.241.56.225]:48738) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdBzY-0005Pk-Sf for emacs-devel@gnu.org; Wed, 01 Apr 2015 02:19:09 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by hylle05.itea.ntnu.no (Postfix) with ESMTP id 8DD88901187; Wed, 1 Apr 2015 08:19:07 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hylle05.itea.ntnu.no Original-Received: from [192.168.1.102] (134-51-15.connect.netcom.no [46.15.51.134]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: hanche) by hylle05.itea.ntnu.no (Postfix) with ESMTPSA id 77D82900EC8; Wed, 1 Apr 2015 08:19:00 +0200 (CEST) User-Agent: Postbox 3.0.11 (Macintosh/20140602) In-Reply-To: <87k2xwj11j.fsf@uwakimon.sk.tsukuba.ac.jp> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 129.241.56.225 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:184690 Archived-At: Stephen J. Turnbull wrote: > Richard's repo is tangled *because* he, like you, doesn't commit until > he's ready to push. That's overstating it; it is clear from his reflog (posted to the list)=20 that he committed three times before the disaster. He did neglect to=20 commit *once* before pulling, that is true. I used to think that is what=20 caused his problems too, but Eli says he *should* pull before=20 committing, so that can't be the reason. =E2=80=93 Harald