git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Unexpected cherry-pick behaviour

From
Junio C Hamano <gitster@pobox.com>
Date
Dec 14, 2013, 19:33 UTC
Message-ID
<7vvbyrgrcv.fsf@alter.siamese.dyndns.org>
In-Reply-To
<CALWbr2y1YDX0dzjpZoF8WL4+ND+8drurH+Wrf1wBs_-=0datOA@mail.gmail.com>
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?
Show 5 quoted lines
> 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.

Previous: Junio C HamanoNext: Antoine Pelisse
Message 12 of 13 in “Unexpected cherry-pick behaviour”
  1. Paulo MatosDec 10, 2013
  2. Junio C HamanoDec 10, 2013
  3. Paulo MatosDec 11, 2013
  4. Antoine PelisseDec 11, 2013
  5. Paulo MatosDec 11, 2013
  6. Antoine PelisseDec 14, 2013
  7. Philip OakleyDec 14, 2013
  8. Junio C HamanoDec 14, 2013
  9. Philip OakleyDec 15, 2013
  10. Philip OakleyDec 16, 2013
  11. Junio C HamanoDec 16, 2013
  12. Junio C HamanoDec 14, 2013
  13. Antoine PelisseDec 14, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.