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: Sat, 04 Apr 2015 00:40:58 +0300 Message-ID: References: <83twx2xoc8.fsf@gnu.org> <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> <87384ii26v.fsf@uwakimon.sk.tsukuba.ac.jp> <83wq1tptvp.fsf@gnu.org> <87pp7lhc9h.fsf@uwakimon.sk.tsukuba.ac.jp> <83sichpqe9.fsf@gnu.org> <87ioddglu6.fsf@uwakimon.sk.tsukuba.ac.jp> <83a8yoq56m.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1428097284 1593 80.91.229.3 (3 Apr 2015 21:41:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 3 Apr 2015 21:41:24 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Apr 03 23:41:16 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 1Ye9L0-00025r-Qh for ged-emacs-devel@m.gmane.org; Fri, 03 Apr 2015 23:41:14 +0200 Original-Received: from localhost ([::1]:35426 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ye9L0-0001Lh-94 for ged-emacs-devel@m.gmane.org; Fri, 03 Apr 2015 17:41:14 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60014) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ye9Kx-0001La-9q for emacs-devel@gnu.org; Fri, 03 Apr 2015 17:41:12 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ye9Ku-0006tN-3U for emacs-devel@gnu.org; Fri, 03 Apr 2015 17:41:11 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:42874) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ye9Kt-0006tB-Tc for emacs-devel@gnu.org; Fri, 03 Apr 2015 17:41:08 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Ye9Kr-0001zQ-95 for emacs-devel@gnu.org; Fri, 03 Apr 2015 23:41:05 +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 ; Fri, 03 Apr 2015 23:41:05 +0200 Original-Received: from sorganov by 89.175.180.246 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 03 Apr 2015 23:41:05 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 19 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:184849 Archived-At: Eli Zaretskii writes: > It's for Alan to say if it's more helpful than saying that a merge is > "just a commit". You are putting words into (my?) mouth. Nobody ever said that merge, the operation, is just a commit, AFAIR. If you indeed meant me, that's what I said: 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. I fail to see how this could be taken as saying that merge is just a commit. What I wanted to tell /you/, not /Alan/, is that there is no any hidden meta-information or other mysteries involved. -- Sergey.