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: Mon, 06 Apr 2015 18:28:05 +0300 Message-ID: References: <83twx2xoc8.fsf@gnu.org> <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> <838ue8pd03.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 1428334119 2260 80.91.229.3 (6 Apr 2015 15:28:39 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 6 Apr 2015 15:28:39 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Apr 06 17:28:24 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 1Yf8wn-0000FF-CK for ged-emacs-devel@m.gmane.org; Mon, 06 Apr 2015 17:28:21 +0200 Original-Received: from localhost ([::1]:40558 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yf8wm-0001Rf-HJ for ged-emacs-devel@m.gmane.org; Mon, 06 Apr 2015 11:28:20 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:32811) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yf8wi-0001R3-KL for emacs-devel@gnu.org; Mon, 06 Apr 2015 11:28:17 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yf8wf-0004sE-EQ for emacs-devel@gnu.org; Mon, 06 Apr 2015 11:28:16 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:34154) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yf8wf-0004s7-7K for emacs-devel@gnu.org; Mon, 06 Apr 2015 11:28:13 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Yf8wd-00008d-Qj for emacs-devel@gnu.org; Mon, 06 Apr 2015 17:28:11 +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 ; Mon, 06 Apr 2015 17:28:11 +0200 Original-Received: from sorganov by 89.175.180.246 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 06 Apr 2015 17:28:11 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 60 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:185043 Archived-At: Eli Zaretskii writes: >> From: Sergey Organov >> Date: Sat, 04 Apr 2015 00:40:58 +0300 >> >> 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. > > It was a long sub-thread, so I can understand how you could forget > what started it. Let me remind you: I didn't forget it. Thanks for reminding anyway. > > You: > >> >> "Incorporates changes from the named commits (since the time their >> >> histories diverged from the current branch) into the current branch." > > Me: > >> > Good luck understanding this when learning what merge does in Git! >> > Starting from the "branch" thingy, which, as you will read everywhere >> > is just a pointer to the HEAD commit. So what does it mean to >> > "incorporate changes in the current branch", if the branch is just a >> > pointer? > > You: > >> Yes, a pointer that moves to point to new commit automatically every >> time you commit on the branch. Incorporating changes means the same >> thing every time: commit. What's new or unusual about it? > > Which I interpreted as you saying that a merge "means" ("is") "just a > commit", like every other commit. I tried to answer to the essence of your question to the best of my knowledge of Git, just to later receive a blame in being only 90% precise and in confusing people by saying that "merge is just commit", that I never said. I see I made a mistake trying to explain "git merge" manual to you, thinking that I can do it better than the manual itself. I can't. -- Sergey.