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: Wed, 01 Apr 2015 19:18:44 +0300 Message-ID: <83pp7nrfdn.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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1427905161 29058 80.91.229.3 (1 Apr 2015 16:19:21 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 1 Apr 2015 16:19:21 +0000 (UTC) Cc: emacs-devel@gnu.org To: Sergey Organov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 01 18:19:08 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 1YdLMA-00033y-QG for ged-emacs-devel@m.gmane.org; Wed, 01 Apr 2015 18:19:06 +0200 Original-Received: from localhost ([::1]:53830 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdLMA-0007DP-4s for ged-emacs-devel@m.gmane.org; Wed, 01 Apr 2015 12:19:06 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38501) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdLM3-00077E-Hn for emacs-devel@gnu.org; Wed, 01 Apr 2015 12:19:03 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdLLy-0000Cm-5B for emacs-devel@gnu.org; Wed, 01 Apr 2015 12:18:59 -0400 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:36770) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdLLx-0000Cb-Ub for emacs-devel@gnu.org; Wed, 01 Apr 2015 12:18:54 -0400 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0NM400L00YN4S000@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Wed, 01 Apr 2015 19:18:53 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NM400LXGYNGKT70@a-mtaout20.012.net.il>; Wed, 01 Apr 2015 19:18:53 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.166 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:184741 Archived-At: > 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. > > And then there's "histories diverged" part, of course, that is never > > explained. > > Yeah it's total mystery to everybody. If one is so novice that she has > no idea about "history diverged" thingy, she should really start from > some basic tutorial, not from reading "git merge" manual page. Please don't underestimate the difficulty of reading highly technical text full of unexplained terminology. > In this particular case he said utter lie Whoa! Slow down, nobody lies here. > > 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.