emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Obscure error/warning/information message from git pull


From: Sergey Organov
Subject: Re: Obscure error/warning/information message from git pull
Date: Fri, 14 Nov 2014 23:57:56 +0300
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux)

Alan Mackenzie <address@hidden> writes:

> Hello, Andrew.
>
> Thanks for the answer!
>
> On Fri, Nov 14, 2014 at 03:14:34PM +0100, Andrew Burgess wrote:
>> * Tassilo Horn <address@hidden> [2014-11-14 14:10:15 +0100]:
>
>> > Alan Mackenzie <address@hidden> 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.




reply via email to

[Prev in Thread] Current Thread [Next in Thread]