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: Thu, 02 Apr 2015 18:18:41 +0300 Message-ID: <83a8yqr226.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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1427987956 21696 80.91.229.3 (2 Apr 2015 15:19:16 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 2 Apr 2015 15:19:16 +0000 (UTC) Cc: emacs-devel@gnu.org To: Sergey Organov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Apr 02 17:19:09 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 1YdgtZ-0005Ih-7v for ged-emacs-devel@m.gmane.org; Thu, 02 Apr 2015 17:19:01 +0200 Original-Received: from localhost ([::1]:58867 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdgtY-00008w-CD for ged-emacs-devel@m.gmane.org; Thu, 02 Apr 2015 11:19:00 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36069) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdgtS-0008W8-J2 for emacs-devel@gnu.org; Thu, 02 Apr 2015 11:18:55 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdgtN-0005nz-DD for emacs-devel@gnu.org; Thu, 02 Apr 2015 11:18:54 -0400 Original-Received: from mtaout26.012.net.il ([80.179.55.182]:39300) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdgtN-0005nd-4u for emacs-devel@gnu.org; Thu, 02 Apr 2015 11:18:49 -0400 Original-Received: from conversion-daemon.mtaout26.012.net.il by mtaout26.012.net.il (HyperSendmail v2007.08) id <0NM600900QEOKX00@mtaout26.012.net.il> for emacs-devel@gnu.org; Thu, 02 Apr 2015 18:19:56 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout26.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NM6008T6QL8KB10@mtaout26.012.net.il>; Thu, 02 Apr 2015 18:19:56 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.182 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:184786 Archived-At: > 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. > > Saying that documentation is inadequate isn't spreading > > misinformation. > > Please re-read what I complained about. Here is what Alan said about git > merge manual page: > > "... it doesn't even say where the two sources for its merge come from, > or where it puts the result." > > "Part of the problem is that the git-merge man page doesn't say that it > messes with the working tree." I understood that as meaning the information was not clear enough.