From: Francis Moreau <francis.moro@gmail.com>
To: Michael J Gruber <git@drmicha.warpmail.net>
Cc: git@vger.kernel.org
Subject: Re: Question about git-cherry and the rev list it's using
Date: Fri, 13 May 2011 09:02:27 +0200 [thread overview]
Message-ID: <BANLkTi=d+gDhgnmOzUDfHhGJP76JuLHJ2Q@mail.gmail.com> (raw)
In-Reply-To: <BANLkTi=qRbpBG_PDPjO_TVEe+nWqrFQ28w@mail.gmail.com>
On Fri, May 13, 2011 at 8:54 AM, Francis Moreau <francis.moro@gmail.com> wrote:
> [ resending to the mailing list too ]
>
> On Thu, May 12, 2011 at 8:47 AM, Michael J Gruber
> <git@drmicha.warpmail.net> wrote:
>> Francis Moreau venit, vidit, dixit 11.05.2011 18:11:
>>> Hello,
>>>
>>> I'm using "git cherry old master base" to see if all commits between
>>> master and base have been applied in my 'old' branch.
>>>
>>> So I expect that git cherry is using a list of commits given by : "git
>>> rev-list --no-merges base..master".
>>
>> Not really.
>>
>> For each commit in "--no-merges old..master ^base" (i.e. "--no-merges
>> master ^old ^base"), "git cherry" checks whether there is a patch
>> equivalent commit in "--no-merges master..old", and outputs it with + or -.
>>
>
> oh you're right, I missed the case when old has been merged in master.
>
BTW, can't it be convenient for users if git-cherry also displays the
sha1 of the commits which have been merged upstream (the ones with the
'-' sign) ?
Thanks
--
Francis
next prev parent reply other threads:[~2011-05-13 7:02 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-11 16:11 Question about git-cherry and the rev list it's using Francis Moreau
2011-05-12 6:47 ` Michael J Gruber
2011-05-13 6:54 ` Francis Moreau
2011-05-13 7:02 ` Francis Moreau [this message]
2011-05-13 11:13 ` Michael J Gruber
2011-05-13 16:29 ` Francis Moreau
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='BANLkTi=d+gDhgnmOzUDfHhGJP76JuLHJ2Q@mail.gmail.com' \
--to=francis.moro@gmail.com \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.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).