From: Junio C Hamano <gitster@pobox.com>
To: Antoine Pelisse <apelisse@gmail.com>
Cc: Paulo Matos <paulo@matos-sorge.com>, git <git@vger.kernel.org>,
git-owner@vger.kernel.org
Subject: Re: Unexpected cherry-pick behaviour
Date: Sat, 14 Dec 2013 11:33:20 -0800 [thread overview]
Message-ID: <7vvbyrgrcv.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <CALWbr2y1YDX0dzjpZoF8WL4+ND+8drurH+Wrf1wBs_-=0datOA@mail.gmail.com> (Antoine Pelisse's message of "Sat, 14 Dec 2013 10:40:14 +0100")
Antoine Pelisse <apelisse@gmail.com> writes:
> If you only want to see the diff applied to master, you
> should run:
>
> $ git diff --ours
Does "git diff HEAD" have the same/similar effect?
> You can also have a look at what is currently being applied:
>
> $ git diff :1:gcc/tree-ssa-threadedge.c :3:gcc/tree-ssa-threadedge.c
>
> By the way, does anybody know a better way to do that ?
In a merge, you can say "git diff ...MERGE_HEAD" (three-dots). You
should be able to tell "git show" the commit you are trying to pick
during a cherry-pick, I think.
next prev parent reply other threads:[~2013-12-14 19:33 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-10 11:04 Unexpected cherry-pick behaviour Paulo Matos
2013-12-10 19:34 ` Junio C Hamano
2013-12-11 10:04 ` Paulo Matos
2013-12-11 11:09 ` Antoine Pelisse
2013-12-11 11:19 ` Paulo Matos
2013-12-14 9:40 ` Antoine Pelisse
2013-12-14 14:53 ` Philip Oakley
2013-12-14 19:39 ` Junio C Hamano
2013-12-15 14:48 ` Philip Oakley
2013-12-16 19:00 ` Philip Oakley
2013-12-16 20:15 ` Junio C Hamano
2013-12-14 19:33 ` Junio C Hamano [this message]
2013-12-14 19:47 ` Antoine Pelisse
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=7vvbyrgrcv.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=apelisse@gmail.com \
--cc=git-owner@vger.kernel.org \
--cc=git@vger.kernel.org \
--cc=paulo@matos-sorge.com \
/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).