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 10:35:21 +0300 Message-ID: <83vbhdpsue.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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1428046547 11007 80.91.229.3 (3 Apr 2015 07:35:47 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 3 Apr 2015 07:35:47 +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 09:35:38 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 1Ydw8f-00074T-NN for ged-emacs-devel@m.gmane.org; Fri, 03 Apr 2015 09:35:37 +0200 Original-Received: from localhost ([::1]:32893 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ydw8e-0005hR-Jh for ged-emacs-devel@m.gmane.org; Fri, 03 Apr 2015 03:35:36 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43116) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ydw8Z-0005hG-8Y for emacs-devel@gnu.org; Fri, 03 Apr 2015 03:35:32 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ydw8W-0007YC-3H for emacs-devel@gnu.org; Fri, 03 Apr 2015 03:35:31 -0400 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:58175) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ydw8V-0007Y2-PZ for emacs-devel@gnu.org; Fri, 03 Apr 2015 03:35:27 -0400 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0NM700H00ZEQT600@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Fri, 03 Apr 2015 10:35:26 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NM700HW5ZR1QT30@a-mtaout22.012.net.il>; Fri, 03 Apr 2015 10:35:26 +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:184814 Archived-At: > From: Sergey Organov > Date: Thu, 02 Apr 2015 23:50:03 +0300 > > If you did not mean that storing 2 references instead of 1 into the > commit object is doing "much more than just commit", then what did you > mean? The Git glossary says: commit As a noun: A single point in the Git history; the entire history of a project is represented as a set of interrelated commits. merge As a verb: To bring the contents of another branch (possibly from an external repository) into the current branch. [...] Merging is performed by an automatic process that identifies changes made since the branches diverged, and then applies all those changes together. [...] As a noun: [...] a successful merge results in the creation of a new commit representing the result of the merge, and having as parents the tips of the merged branches. Alan was interested in what the merge does, which is outlined in the "merge as a verb" part above. That description clearly says that a merge _results_ in a commit, but it is _not_ "just a commit", especially if you, like Alan, are interested in what happens _during_ the merge operation. I hope this clarifies what I meant. In plain words, when people who know little about Git ask what does a merge do, and you want to be helpful, don't say confusingly paradoxical things, even if they are 90% correct, because all that will do is confuse them even more. (My advice, feel free to disregard.)