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 18:05:21 +0000 Message-ID: <20141114180521.GA3168@acm.acm> References: <20141114120604.GA3859@acm.acm> <87389mkjwo.fsf@thinkpad-t440p.tsdh.org> <20141114141434.GM3565@embecosm.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1415988386 28589 80.91.229.3 (14 Nov 2014 18:06:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 14 Nov 2014 18:06:26 +0000 (UTC) Cc: emacs-devel@gnu.org To: Andrew Burgess Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 14 19:06:19 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 1XpLGE-0000XZ-OY for ged-emacs-devel@m.gmane.org; Fri, 14 Nov 2014 19:06:18 +0100 Original-Received: from localhost ([::1]:37470 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpLGE-0003EA-AN for ged-emacs-devel@m.gmane.org; Fri, 14 Nov 2014 13:06:18 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43703) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpLG5-0003Dt-Cb for emacs-devel@gnu.org; Fri, 14 Nov 2014 13:06:14 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpLG0-0003SJ-7Y for emacs-devel@gnu.org; Fri, 14 Nov 2014 13:06:09 -0500 Original-Received: from colin.muc.de ([193.149.48.1]:36986 helo=mail.muc.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpLFz-0003Ql-Rk for emacs-devel@gnu.org; Fri, 14 Nov 2014 13:06:04 -0500 Original-Received: (qmail 24585 invoked by uid 3782); 14 Nov 2014 18:06:01 -0000 Original-Received: from acm.muc.de (pD95186C8.dip0.t-ipconnect.de [217.81.134.200]) by colin.muc.de (tmda-ofmipd) with ESMTP; Fri, 14 Nov 2014 19:06:00 +0100 Original-Received: (qmail 4148 invoked by uid 1000); 14 Nov 2014 18:05:21 -0000 Content-Disposition: inline In-Reply-To: <20141114141434.GM3565@embecosm.com> 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:177100 Archived-At: 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. It seems also that git clone hasn't worked properly. The above command didn't work until I "initialised" the emacs-24 branch by doing git checkout emacs-24 . What's going on here? git log is being piped into less, which is objectionable. If I want it in less, I'm quite capable of saying so. Is there a flag I can give to stop my stdout being hijacked, or can I configure it away somehow? > git log origin/some-branch > this will not include any commits you've made to your local copy of > 'some-branch' (and assumes that you're remote is called origin). What does "origin" mean here? Is it the repository whence the current repository was cloned, or is it the one in savannah? > Another useful feature I use a lot is: > git log some-branch -- path/to/a/file > this restricts the log to only those commits on 'some-branch' that > touch 'path/to/a/file'. How do I specify "git log ALL-branches -- path/to/a/file". This doesn't seem to be the default. Or am I just confused? > HTH It does! > Andrew -- Alan Mackenzie (Nuremberg, Germany).