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 18:10:35 +0300 Message-ID: <83384jsx3o.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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1427901077 21486 80.91.229.3 (1 Apr 2015 15:11:17 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 1 Apr 2015 15:11:17 +0000 (UTC) Cc: acm@muc.de, emacs-devel@gnu.org To: Sergey Organov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 01 17:11: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 1YdKIN-0006lb-4l for ged-emacs-devel@m.gmane.org; Wed, 01 Apr 2015 17:11:07 +0200 Original-Received: from localhost ([::1]:53208 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdKIM-00057K-EQ for ged-emacs-devel@m.gmane.org; Wed, 01 Apr 2015 11:11:06 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44285) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdKI5-00057E-S9 for emacs-devel@gnu.org; Wed, 01 Apr 2015 11:10:51 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdKI2-0002au-JC for emacs-devel@gnu.org; Wed, 01 Apr 2015 11:10:49 -0400 Original-Received: from mtaout27.012.net.il ([80.179.55.183]:58020) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdKI1-0002aE-PO for emacs-devel@gnu.org; Wed, 01 Apr 2015 11:10:46 -0400 Original-Received: from conversion-daemon.mtaout27.012.net.il by mtaout27.012.net.il (HyperSendmail v2007.08) id <0NM400J00V8FUU00@mtaout27.012.net.il> for emacs-devel@gnu.org; Wed, 01 Apr 2015 18:05:34 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout27.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NM400C38V9ASU70@mtaout27.012.net.il>; Wed, 01 Apr 2015 18:05:34 +0300 (IDT) In-reply-to: <87h9t080gx.fsf@javad.com> 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.183 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:184723 Archived-At: > From: Sergey Organov > Date: Wed, 01 Apr 2015 16:03:26 +0300 > Cc: emacs-devel@gnu.org > > > Exaggeration rather than insinuation, I think you mean. > > I said what I meant: insinuation. I think you were wrong. > If you are not interested in details, the manual page explains what > merge does and where it puts result in the first sentence of the > description: > > "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? And then there's "histories diverged" part, of course, that is never explained. And finally, even if you succeed in negotiating these obstacles, there's still the important question: what does it mean to "incorporate in the branch"? what does it change, and in what order? Of course, if you already know how merge works in Git, have merged your own branches several times, and had your share of mistakes until you finally got it -- then this text will speak volumes to you. But that's not what Alan complained about. > >> > Part of the problem is that the git-merge man page doesn't say that > >> > it messes with the working tree > > Oh, really? Anybody who doesn't actively avoid to understand anything > "git" will easily infer that the working tree should be updated > accordingly, as "the current" is those branch that working tree > reflects, by definition. Oh, really? You mean merge doesn't work, or is a no-op, in a "bare" repository, where there's no tree? Give up! Git's documentation "needs work" (TM). It's futile to try to refute that.