From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Sergey Organov Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Thu, 02 Apr 2015 16:32:30 +0300 Message-ID: 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> <551D3B28.5040909@math.ntnu.no> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1427981598 8229 80.91.229.3 (2 Apr 2015 13:33:18 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 2 Apr 2015 13:33:18 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Apr 02 15:33:03 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 1YdfF0-00061S-BU for ged-emacs-devel@m.gmane.org; Thu, 02 Apr 2015 15:33:02 +0200 Original-Received: from localhost ([::1]:58353 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdfEz-000179-Ip for ged-emacs-devel@m.gmane.org; Thu, 02 Apr 2015 09:33:01 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60656) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdfEh-00016o-0U for emacs-devel@gnu.org; Thu, 02 Apr 2015 09:32:48 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdfEe-00014v-62 for emacs-devel@gnu.org; Thu, 02 Apr 2015 09:32:42 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:55016) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdfEe-00014f-0K for emacs-devel@gnu.org; Thu, 02 Apr 2015 09:32:40 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1YdfEb-0005it-Cy for emacs-devel@gnu.org; Thu, 02 Apr 2015 15:32:37 +0200 Original-Received: from 89.175.180.246 ([89.175.180.246]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 02 Apr 2015 15:32:37 +0200 Original-Received: from sorganov by 89.175.180.246 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 02 Apr 2015 15:32:37 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 22 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 89.175.180.246 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.4 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:184779 Archived-At: Harald Hanche-Olsen writes: > 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, the >> 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 content >> preparation for this commit. > > Yes, but that complexity can be considerable. Isn't it reasonable to > assume that that is what Eli had in mind? I prefer not to assume if I can ask. We seem to discuss git, not complexity of content merge algorithms. Maybe Eli has some ideas about something else git does besides committing resulting changes, how do I know? -- Sergey.