2016-10-26 12:56:21

by Dmitry Safonov

[permalink] [raw]
Subject: [Question] Git histrory after greybus merge

Hi,

Is there any way to specify git-log or git-rev-list which root tree to use?
I mean, I got the following situation:
I saw the commit a67dd266adf4 ("netfilter: xtables: prepare for
on-demand hook register")
by git-blame and want to see commits on top of that particular commit.
Earlier I've used for that:
$ git log --reverse a67dd266adf4^..HEAD

But now after merging greybus it follows the greybus's tree and shows me:
[linux]$ git log --reverse a67dd266adf4^..HEAD --oneline
cd26f1bd6bf3 greybus: Initial commit
c8a797a98cb6 greybus: Import most recent greybus code to new repo.
06823c3eb9c4 greybus: README and .gitignore updates

Which quite sucks as this isn't a hash I'm referencing.
Anyway, back to the question, is there any option to tell git which tree to use?
I'm sure this was asked before (on btrfs merge?), but I didn't find
the answer so far.
I'm using git v2.10.1 if anything.

Thanks,
Dmitry


2016-10-26 13:17:53

by Dmitry Safonov

[permalink] [raw]
Subject: Re: [Question] Git histrory after greybus merge

Adding Cc: git list, Junio.

2016-10-26 15:55 GMT+03:00 Dmitry Safonov <[email protected]>:
> Hi,
>
> Is there any way to specify git-log or git-rev-list which root tree to use?
> I mean, I got the following situation:
> I saw the commit a67dd266adf4 ("netfilter: xtables: prepare for
> on-demand hook register")
> by git-blame and want to see commits on top of that particular commit.
> Earlier I've used for that:
> $ git log --reverse a67dd266adf4^..HEAD
>
> But now after merging greybus it follows the greybus's tree and shows me:
> [linux]$ git log --reverse a67dd266adf4^..HEAD --oneline
> cd26f1bd6bf3 greybus: Initial commit
> c8a797a98cb6 greybus: Import most recent greybus code to new repo.
> 06823c3eb9c4 greybus: README and .gitignore updates
>
> Which quite sucks as this isn't a hash I'm referencing.
> Anyway, back to the question, is there any option to tell git which tree to use?
> I'm sure this was asked before (on btrfs merge?), but I didn't find
> the answer so far.
> I'm using git v2.10.1 if anything.
>
> Thanks,
> Dmitry