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 15:27:18 +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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1427977676 7696 80.91.229.3 (2 Apr 2015 12:27:56 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 2 Apr 2015 12:27:56 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Apr 02 14:27:47 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 1YdeDq-0004ec-9m for ged-emacs-devel@m.gmane.org; Thu, 02 Apr 2015 14:27:46 +0200 Original-Received: from localhost ([::1]:58041 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdeDp-0004JF-Dx for ged-emacs-devel@m.gmane.org; Thu, 02 Apr 2015 08:27:45 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45880) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdeDm-0004II-CE for emacs-devel@gnu.org; Thu, 02 Apr 2015 08:27:43 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdeDj-000273-0b for emacs-devel@gnu.org; Thu, 02 Apr 2015 08:27:42 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:49153) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdeDi-00025z-PG for emacs-devel@gnu.org; Thu, 02 Apr 2015 08:27:38 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1YdeDg-0004Xh-ON for emacs-devel@gnu.org; Thu, 02 Apr 2015 14:27:36 +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 14:27:36 +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 14:27:36 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 59 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:184777 Archived-At: 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. 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. [...] >> In this particular case he said utter lie > > Whoa! Slow down, nobody lies here. I didn't mean that he intentionally lied, sorry if it sounded like that. What he said is not true though. Misinformation. > >> > Give up! Git's documentation "needs work" (TM). It's futile to try >> > to refute that. >> >> Nobody refutes it. Any documentation needs work (TM). Git's needs work. >> It does not mean that spreading misinformation about its current state >> is acceptable. > > 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'm sorry, but it /is/ plain misinformation, as anybody can readily see himself by RTM. Don't spread misinformation, please. -- Sergey.