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: Fri, 14 Nov 2014 23:57:56 +0300 Message-ID: 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 1415998710 15026 80.91.229.3 (14 Nov 2014 20:58:30 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 14 Nov 2014 20:58:30 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 14 21:58:23 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 1XpNwk-0005ra-DU for ged-emacs-devel@m.gmane.org; Fri, 14 Nov 2014 21:58:22 +0100 Original-Received: from localhost ([::1]:37857 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpNwj-0001aO-Nr for ged-emacs-devel@m.gmane.org; Fri, 14 Nov 2014 15:58:21 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43042) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpNwc-0001aI-Ge for emacs-devel@gnu.org; Fri, 14 Nov 2014 15:58:19 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpNwX-0006nT-Cg for emacs-devel@gnu.org; Fri, 14 Nov 2014 15:58:14 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:59499) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpNwX-0006nO-6G for emacs-devel@gnu.org; Fri, 14 Nov 2014 15:58:09 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1XpNwV-0005it-Pg for emacs-devel@gnu.org; Fri, 14 Nov 2014 21:58:07 +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 ; Fri, 14 Nov 2014 21:58:07 +0100 Original-Received: from sorganov by 89.175.180.246 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 14 Nov 2014 21:58:07 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 62 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:177120 Archived-At: Alan Mackenzie writes: > Hello, Andrew. > > Thanks for the answer! > > On Fri, Nov 14, 2014 at 03:14:34PM +0100, Andrew Burgess wrote: >> * Tassilo Horn [2014-11-14 14:10:15 +0100]: > >> > Alan Mackenzie writes: > >> > > Then I wanted to list only those those commits in the emacs-24 branch. >> > > Ha! "git help log" was of no help. It goes into a man page, and >> > > there is nothing helpful there thus to restrict the display. There >> > > appears not to be an option such as "-b emacs-24". There is a >> > > "--branches" option, but what that is supposed to do is completely >> > > opaque to me. How do I do what I want, here? > >> > Probably, "git checkout emacs-24 && git log". > >> This is correct, but you can skip the checkout and just do: > >> git log some-branch > >> to get a log of all commits in the local branch 'some-branch'. >> Alternatively so see what's in the same branch on the remote: > > 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. Try: $ git log --oneline --decorate emacs24 ^master that will show all commits that are reachable from 'emacs24' but not reachable from 'master'. Look up SPECIFYING RANGES in $ man gitrevisions for other possibilities. Also try: $ git show-branch emacs24 master HTH. -- Sergey.