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 20:02:02 +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> <83a8yqr226.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 1427994158 7003 80.91.229.3 (2 Apr 2015 17:02:38 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 2 Apr 2015 17:02:38 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Apr 02 19:02:32 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 1YdiVg-0003Wg-Px for ged-emacs-devel@m.gmane.org; Thu, 02 Apr 2015 19:02:28 +0200 Original-Received: from localhost ([::1]:59448 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdiVg-0001mM-9U for ged-emacs-devel@m.gmane.org; Thu, 02 Apr 2015 13:02:28 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60480) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdiVZ-0001mE-Vk for emacs-devel@gnu.org; Thu, 02 Apr 2015 13:02:25 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdiVX-0004oq-7l for emacs-devel@gnu.org; Thu, 02 Apr 2015 13:02:21 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:45424) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdiVX-0004oi-0n for emacs-devel@gnu.org; Thu, 02 Apr 2015 13:02:19 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1YdiVT-0003Li-1g for emacs-devel@gnu.org; Thu, 02 Apr 2015 19:02:15 +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 19:02:15 +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 19:02:15 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 35 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:184793 Archived-At: Eli Zaretskii writes: >> From: Sergey Organov >> Date: Thu, 02 Apr 2015 15:27:18 +0300 >> >> Eli Zaretskii writes: >> >> From: Sergey Organov >> >> Date: Wed, 01 Apr 2015 18:52:20 +0300 >> >> >> >> >> "Incorporates changes from the named commits (since the time their >> >> >> histories diverged from the current branch) into the current branch." >> >> > >> >> > 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? >> >> >> >> 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? >> > >> > A merge does much more than just commit. At least AFAIU. >> >> Dunno what you have in mind. > > The changes to meta-data that reflect the changes in the history DAG. No meta-data outside of the commit, AFAIK. Each commit has zero or more pointers to parents, usually 1. Merge commit is commit that has more pointers to parents than 1 (usually 2). That's all about the meta-data. Simple, eh? -- Sergey.