From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Alan Mackenzie Newsgroups: gmane.emacs.devel Subject: Re: Obscure error/warning/information message from git pull Date: Fri, 14 Nov 2014 23:02:36 +0000 Message-ID: <20141114230235.GF3168@acm.acm> References: <20141114120604.GA3859@acm.acm> <87389mkjwo.fsf@thinkpad-t440p.tsdh.org> <20141114141434.GM3565@embecosm.com> <20141114180521.GA3168@acm.acm> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1416006226 6015 80.91.229.3 (14 Nov 2014 23:03:46 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 14 Nov 2014 23:03:46 +0000 (UTC) Cc: emacs-devel@gnu.org To: Sergey Organov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 15 00:03:39 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 1XpPtw-0006GE-GH for ged-emacs-devel@m.gmane.org; Sat, 15 Nov 2014 00:03:36 +0100 Original-Received: from localhost ([::1]:38108 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpPtw-0001Nr-50 for ged-emacs-devel@m.gmane.org; Fri, 14 Nov 2014 18:03:36 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33166) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpPte-0001Ms-DG for emacs-devel@gnu.org; Fri, 14 Nov 2014 18:03:24 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpPtX-0005LY-TK for emacs-devel@gnu.org; Fri, 14 Nov 2014 18:03:18 -0500 Original-Received: from colin.muc.de ([193.149.48.1]:14736 helo=mail.muc.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpPtX-0005LG-Kp for emacs-devel@gnu.org; Fri, 14 Nov 2014 18:03:11 -0500 Original-Received: (qmail 983 invoked by uid 3782); 14 Nov 2014 23:03:10 -0000 Original-Received: from acm.muc.de (pD95186C8.dip0.t-ipconnect.de [217.81.134.200]) by colin.muc.de (tmda-ofmipd) with ESMTP; Sat, 15 Nov 2014 00:03:09 +0100 Original-Received: (qmail 5690 invoked by uid 1000); 14 Nov 2014 23:02:36 -0000 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-Delivery-Agent: TMDA/1.1.12 (Macallan) X-Primary-Address: acm@muc.de X-detected-operating-system: by eggs.gnu.org: FreeBSD 8.x X-Received-From: 193.149.48.1 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:177131 Archived-At: Hello, Sergey. On Fri, Nov 14, 2014 at 11:57:56PM +0300, Sergey Organov wrote: > Alan Mackenzie writes: > > Thanks! But the log doesn't identify which branch the commits are in. > > How do I persuade git log to do this? > > Now, I've discovered I can do > > git log -n5 emacs24 master -- > > and this works, but it doesn't say which commit is in which branch. > > YUCK. > 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?), otherwise your command below couldn't work. > 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. > Look up SPECIFYING RANGES in > $ man gitrevisions > for other possibilities. > Also try: > $ git show-branch emacs24 master > HTH. > -- > Sergey. -- Alan Mackenzie (Nuremberg, Germany).