From: Vegard Nossum <vegard.nossum@gmail.com>
To: Richard Weinberger <richard.weinberger@gmail.com>
Cc: sedat.dilek@gmail.com,
Linus Torvalds <torvalds@linux-foundation.org>,
LKML <linux-kernel@vger.kernel.org>,
x86 maintainers <x86@kernel.org>
Subject: Re: Merge branch 'l1tf-final' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Date: Fri, 17 Aug 2018 10:33:55 +0200 [thread overview]
Message-ID: <CAOMGZ=G-MU7qTSeA4VFK+-nx2jFAM2fGL8WpQ6eBRvovEhaneQ@mail.gmail.com> (raw)
In-Reply-To: <CAFLxGvxhUyqs3_esJwBjHrTY0Ba=bPB=425hWr0rz-BySTjzoA@mail.gmail.com>
On 16 August 2018 at 17:42, Richard Weinberger
<richard.weinberger@gmail.com> wrote:
> On Thu, Aug 16, 2018 at 2:58 PM Sedat Dilek <sedat.dilek@gmail.com> wrote:
>>
>> Hi Linus,
>>
>> I am here on Linux v4.18 and tried first to merge the l1tf-final Git-branch.
>> Unfortunately, this is no more available in the tip Git-tree.
>>
>> Then I saw Linux v4.18.1 which includes all the above stuff.
>>
>> I tried to 'git cherry-pick -m 1 958f338e96f874a0d29442396d6adf9c1e17aa2d'.
>> I know the commit-id is the hash of a merge.
>> Luckily, I could get the "diff" and applied it.
>> But the history misses.
>>
>> How can I get the history and subjects of all commits in your tree to
>> cherry-pick the single commits?
>>
>> Do you happen to know another solution to get easily all L1TF commits
>> with any other tricks?
>
> That should help:
> git log --oneline
> 958f338e96f874a0d29442396d6adf9c1e17aa2d^..958f338e96f874a0d29442396d6adf9c1e17aa2d
Hey,
As a shorthand for this, you can also use just:
git log --oneline 958f338e96f87^-
The syntax was made especially so that you can see all the commits
that arrived via a merge commit without having to write the rev of the
merge twice but is otherwise exactly equivalent to "rev^..rev".
It should work from git v2.13. Just a tip :-)
Vegard
next prev parent reply other threads:[~2018-08-17 8:34 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-16 7:37 Merge branch 'l1tf-final' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Sedat Dilek
2018-08-16 15:42 ` Richard Weinberger
2018-08-17 6:58 ` Sedat Dilek
2018-08-17 8:33 ` Vegard Nossum [this message]
2018-08-17 8:55 ` Sedat Dilek
2018-08-16 17:14 ` Linus Torvalds
2018-08-17 7:14 ` Sedat Dilek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAOMGZ=G-MU7qTSeA4VFK+-nx2jFAM2fGL8WpQ6eBRvovEhaneQ@mail.gmail.com' \
--to=vegard.nossum@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=richard.weinberger@gmail.com \
--cc=sedat.dilek@gmail.com \
--cc=torvalds@linux-foundation.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).