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, 20:21 UTC
Message-ID
<7v62rcp6m6.fsf@alter.siamese.dyndns.org>
In-Reply-To
<4D87B00D.2010905@gmail.com>
Piotr Krukowiecki <piotr.krukowiecki@gmail.com> writes:
Show 5 quoted lines
>> Sure.  The index contains multiple competing versions, which you can
>> see with "git ls-files -u".  To compare the working tree and one of
>> those use "git diff --base / --ours / --theirs" (or -1 / -2 / -3).
>
> Thanks, didn't know about that (and it's not documented in diff man page).

These "compare a particular stage against working tree file" modes only make sense when you are comparing the index and the working tree, so the description is in "git diff-files" manpage but hasn't been ported to the documentation of generic "git diff" frontend.

Perhaps we should.
Previous: Piotr KrukowieckiNext: Junio C Hamano
Message 9 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.