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: Mon, 17 Nov 2014 14:54:06 +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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1416225294 24220 80.91.229.3 (17 Nov 2014 11:54:54 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 17 Nov 2014 11:54:54 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 17 12:54:47 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 1XqKtK-0005vP-Ul for ged-emacs-devel@m.gmane.org; Mon, 17 Nov 2014 12:54:47 +0100 Original-Received: from localhost ([::1]:47396 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqKtI-0004S7-Jb for ged-emacs-devel@m.gmane.org; Mon, 17 Nov 2014 06:54:44 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:32992) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqKsz-0004RY-Vk for emacs-devel@gnu.org; Mon, 17 Nov 2014 06:54:31 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XqKsu-0001bD-8a for emacs-devel@gnu.org; Mon, 17 Nov 2014 06:54:25 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:36868) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XqKsu-0001ZZ-2x for emacs-devel@gnu.org; Mon, 17 Nov 2014 06:54:20 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1XqKsr-0005jO-TK for emacs-devel@gnu.org; Mon, 17 Nov 2014 12:54:17 +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 ; Mon, 17 Nov 2014 12:54:17 +0100 Original-Received: from sorganov by 89.175.180.246 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 17 Nov 2014 12:54:17 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 36 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:177397 Archived-At: Alan Mackenzie writes: > >> Because in GIT commits are not on a branch. All commits are arranged into >> DAG, and branch is just a pointer into the DAG. Any given commit is >> either reachable from given branch or not. It's that simple. > > I think you're just playing with words, here. We all know what a branch > is, and git knows which revisions are on which branch (or branches?), You pretend you don't understand what I said above? It's not for playing with words. One better speaks "GIT language" if he wants to be efficient with GIT. Doing otherwise is, well, like speaking procedural in functional language... > otherwise your command below couldn't work. They could, because there is the DAG. >> Try: > >> $ git log --oneline --decorate emacs24 ^master > >> that will show all commits that are reachable from 'emacs24' but not >> reachable from 'master'. > > That's very impressive, but not what I want. I want to see all recent > commits together, each one annotated with which branch it's on. That's > surely not too much to ask for. I want annotation, not filtering. Did you try my another suggestion then? $ git show-branch emacs24 master -- Sergey.