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: Thu, 02 Apr 2015 14:50:48 +0200 Message-ID: <551D3B28.5040909@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> <87y4mdi7tj.fsf@uwakimon.sk.tsukuba.ac.jp> <20150331214347.GH2871@acm.fritz.box> <20150401103225.GA2633@acm.fritz.box> <87h9t080gx.fsf@javad.com> <83384jsx3o.fsf@gnu.org> <83pp7nrfdn.fsf@gnu.org> 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 1427979072 29743 80.91.229.3 (2 Apr 2015 12:51:12 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 2 Apr 2015 12:51:12 +0000 (UTC) Cc: emacs-devel@gnu.org To: Sergey Organov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Apr 02 14:51:09 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 1YdeaT-0004Cj-1C for ged-emacs-devel@m.gmane.org; Thu, 02 Apr 2015 14:51:09 +0200 Original-Received: from localhost ([::1]:58179 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdeaS-0004hw-Fk for ged-emacs-devel@m.gmane.org; Thu, 02 Apr 2015 08:51:08 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:51241) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdeaN-0004ds-1n for emacs-devel@gnu.org; Thu, 02 Apr 2015 08:51:03 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdeaG-0003AG-D4 for emacs-devel@gnu.org; Thu, 02 Apr 2015 08:51:00 -0400 Original-Received: from hylle06.itea.ntnu.no ([129.241.56.235]:54072) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdeaG-00039f-6j for emacs-devel@gnu.org; Thu, 02 Apr 2015 08:50:56 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by hylle06.itea.ntnu.no (Postfix) with ESMTP id 94514661023; Thu, 2 Apr 2015 14:50:51 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at hylle06.itea.ntnu.no Original-Received: from [IPv6:2001:4662:4ffb::9d0b:1161:f52d:849b] (unknown [IPv6:2001:4662:4ffb:0:9d0b:1161:f52d:849b]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: hanche) by hylle06.itea.ntnu.no (Postfix) with ESMTPSA id 7C49F660DCE; Thu, 2 Apr 2015 14:50:50 +0200 (CEST) User-Agent: Postbox 3.0.11 (Macintosh/20140602) In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 129.241.56.235 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:184778 Archived-At: Sergey Organov wrote: > Eli Zaretskii writes: >> A merge does much more than just commit. At least AFAIU. > > Dunno what you have in mind. After true merge operation is finished, th= e > only result of it is single commit appended to your current branch. Git > /is/ that simple. All the possible complexity is in the stage of conten= t > preparation for this commit. Yes, but that complexity can be considerable. Isn't it reasonable to=20 assume that that is what Eli had in mind? =E2=80=93 Harald