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

Re: cherry-pick applies some other changes than the specified one?

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 21, 2011, 19:47 UTC
Message-ID
<7vei60p86y.fsf@alter.siamese.dyndns.org>
In-Reply-To
<4D879516.3060204@gmail.com>
Piotr Krukowiecki <piotr.krukowiecki@gmail.com> writes:
> I think I even suspected this might have something to do with the merge
> conflict and tried to make git-diff show me exact change between working
> tree and index/HEAD (ignoring the merge).

Doesn't "git diff HEAD" show the difference between HEAD and working tree without the higher stages for the path getting in the way?

The difference between the index and the working tree is "git diff" which is condensed. I think you can force it to uncondense it by giving "-c" option, but I haven't tried (didn't find a need/use for it for a long time).

Previous: Piotr KrukowieckiNext: Piotr Krukowiecki
Message 5 of 13 in “cherry-pick applies some other changes than the specified one?”
  1. Piotr KrukowieckiMar 21, 2011
  2. Junio C HamanoMar 21, 2011
  3. Johannes SixtMar 21, 2011
  4. Piotr KrukowieckiMar 21, 2011
  5. Junio C HamanoMar 21, 2011
  6. Piotr KrukowieckiMar 21, 2011
  7. Jonathan NiederMar 21, 2011
  8. Piotr KrukowieckiMar 21, 2011
  9. Junio C HamanoMar 21, 2011
  10. Junio C HamanoMar 21, 2011
  11. Jonathan NiederMar 22, 2011
  12. Junio C HamanoMar 22, 2011
  13. Piotr KrukowieckiMar 22, 2011

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.