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: Fri, 03 Apr 2015 18:08:02 +0300 Message-ID: <83fv8hp7vx.fsf@gnu.org> 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> <83a8yqr226.fsf@gnu.org> <831tk2qvz5.fsf@gnu.org> <83vbhdpsue.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1428073708 14470 80.91.229.3 (3 Apr 2015 15:08:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 3 Apr 2015 15:08:28 +0000 (UTC) Cc: emacs-devel@gnu.org To: Sergey Organov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Apr 03 17:08:19 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 1Ye3Ci-0004jp-NO for ged-emacs-devel@m.gmane.org; Fri, 03 Apr 2015 17:08:16 +0200 Original-Received: from localhost ([::1]:34420 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ye3Ch-0008LE-PA for ged-emacs-devel@m.gmane.org; Fri, 03 Apr 2015 11:08:15 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40623) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ye3Ce-0008L9-02 for emacs-devel@gnu.org; Fri, 03 Apr 2015 11:08:13 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ye3CZ-0004mt-VU for emacs-devel@gnu.org; Fri, 03 Apr 2015 11:08:11 -0400 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:35186) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ye3CZ-0004mW-Nz for emacs-devel@gnu.org; Fri, 03 Apr 2015 11:08:07 -0400 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0NM800L00KOP3T00@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Fri, 03 Apr 2015 18:08:06 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NM800KIYKPHW290@a-mtaout22.012.net.il>; Fri, 03 Apr 2015 18:08:06 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.172 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:184839 Archived-At: > From: Sergey Organov > Date: Fri, 03 Apr 2015 17:43:36 +0300 > > And now I got your recent answer that doesn't even mention either "DAG" > or "meta-data", but rather suddenly unveils the fact that 'git merge' > computes *changes to the tree* before committing the result. I'm sorry, > but I have to give-up at this point. To reiterate what I think should already be clear from the previous messages: merging brings changes from another branch, identifies the subset of changes made since the branches diverged, and then applies those changes, finally creating a merge-commit. (I didn't invent that, it's a more-or-less direct citation from the Git glossary man page.) So yes, it's more than "just a commit". Its result is a special kind of a commit, but the process of merging does more than just that.