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: Obscure error/warning/information message from git pull Date: Tue, 18 Nov 2014 23:57:34 +0300 Message-ID: References: <20141114120604.GA3859@acm.acm> <87389mkjwo.fsf@thinkpad-t440p.tsdh.org> <20141114141434.GM3565@embecosm.com> <20141114180521.GA3168@acm.acm> <20141114230235.GF3168@acm.acm> <20141117141123.GA4294@acm.acm> <83lhn89zxn.fsf@gnu.org> <83bno49xtw.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 1416344300 28384 80.91.229.3 (18 Nov 2014 20:58:20 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 18 Nov 2014 20:58:20 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Nov 18 21:58:13 2014 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 1Xqpql-00058B-Mw for ged-emacs-devel@m.gmane.org; Tue, 18 Nov 2014 21:58:11 +0100 Original-Received: from localhost ([::1]:55320 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xqpql-00019B-En for ged-emacs-devel@m.gmane.org; Tue, 18 Nov 2014 15:58:11 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:32972) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqpqT-000187-Hd for emacs-devel@gnu.org; Tue, 18 Nov 2014 15:57:59 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XqpqN-0005nK-Kp for emacs-devel@gnu.org; Tue, 18 Nov 2014 15:57:53 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:46997) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqpqN-0005n2-Dy for emacs-devel@gnu.org; Tue, 18 Nov 2014 15:57:47 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1XqpqL-0004zg-Ht for emacs-devel@gnu.org; Tue, 18 Nov 2014 21:57:45 +0100 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 ; Tue, 18 Nov 2014 21:57:45 +0100 Original-Received: from sorganov by 89.175.180.246 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 18 Nov 2014 21:57:45 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 43 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.2 (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:177657 Archived-At: Eli Zaretskii writes: >> It's the latter that I've tried to help to achieve. Sorry if I >> failed. > > You cannot help people understand new tools if you start by telling > them to forget everything they've learned. You should instead build > on what they know, or think they know, gradually replacing that with > new knowledge. Sorry, but I really think that to better understand Git, one should forget, at least temporarily, some things she learned from other VCSes. Then after she gets what, say, "branch" means to Git, she can tweak her previous knowledge to fit. > > Regardless, the concept of "branch" as a separate line of development > is not killed by Git. It's just that a branch can be named by its > tip, and vice versa. > >> My point is that branch name doesn't represent anything else but >> particular reference to particular commit in Git. > > No, it also represents all the previous commits made on that branch > that are reachable through first-parents. Well, given the following history (time goes from left to right): - C - D <- foo / ... - A - B \ - E - F <- bar what branch commit A was made on, 'foo' or 'bar'? You see, you should have had no "made on that branch" in your description, provided you describe Gits' idea of a branch, not your one, as Git does not remember on what branch commit was made. -- Sergey.