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: Wed, 01 Apr 2015 16:03:26 +0300 Message-ID: <87h9t080gx.fsf@javad.com> 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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1427894056 28172 80.91.229.3 (1 Apr 2015 13:14:16 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 1 Apr 2015 13:14:16 +0000 (UTC) Cc: emacs-devel@gnu.org To: Alan Mackenzie Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 01 15:14:07 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 1YdIT8-0003wH-Tv for ged-emacs-devel@m.gmane.org; Wed, 01 Apr 2015 15:14:07 +0200 Original-Received: from localhost ([::1]:52449 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdIT8-0005PN-4V for ged-emacs-devel@m.gmane.org; Wed, 01 Apr 2015 09:14:06 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:54333) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdIIw-0003vI-Pj for emacs-devel@gnu.org; Wed, 01 Apr 2015 09:03:35 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdIIs-00064D-8Z for emacs-devel@gnu.org; Wed, 01 Apr 2015 09:03:34 -0400 Original-Received: from mail.javad.com ([54.86.164.124]:53749) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdIIs-00063z-5b for emacs-devel@gnu.org; Wed, 01 Apr 2015 09:03:30 -0400 Original-Received: from osv (unknown [89.175.180.246]) by mail.javad.com (Postfix) with ESMTPSA id 7946761E87; Wed, 1 Apr 2015 13:03:28 +0000 (UTC) Original-Received: from osv by osv with local (Exim 4.84) (envelope-from ) id 1YdIIo-00074n-OH; Wed, 01 Apr 2015 16:03:26 +0300 In-Reply-To: <20150401103225.GA2633@acm.fritz.box> (Alan Mackenzie's message of "Wed, 1 Apr 2015 10:32:25 +0000") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.4 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 54.86.164.124 X-Mailman-Approved-At: Wed, 01 Apr 2015 09:14:04 -0400 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:184710 Archived-At: Alan Mackenzie writes: > Hello, Sergey. > > On Wed, Apr 01, 2015 at 12:28:25PM +0300, Sergey Organov wrote: >> Alan Mackenzie writes: > >> >> > Part of the problem is that the git-merge man page doesn't say that >> >> > it messes with the working tree > >> >> What else would it do? Merge tools have changed the working tree from >> >> time immemorial. > >> > That's poor, Stephen. It might well merge in the repository without >> > touching the working tree. The fact is, the documentation doesn't say >> > this - it doesn't even say where the two sources for its merge come from, >> > or where it puts the result. > >> That's pure insinuation. Git documentation could be far from ideal, but >> it has most of information there. Here is quote from Git manual page on >> merge for you. It mentions what merge does to working tree 4 times, and >> tells you exactly where it puts the two sources of conflicting merges: > > Exaggeration rather than insinuation, I think you mean. I said what I meant: insinuation. > The git documentation is very bad. The information may be there, but > if it is buried deep down in the small print, it is not useful. We're > not talking about arcane details here, we're talking about the basic > functionality - what git merge actually does - what does it merge and > where does it put the result? 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." >> > this - it doesn't even say where the two sources for its merge come from, >> > or where it puts the result. Oh, really? >> > 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. Haters will hate, anyway. -- Sergey.