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

Re: git log and cherry-picks

From
Michael J Gruber <git@drmicha.warpmail.net>
Date
Jun 28, 2010, 19:07 UTC
Message-ID
<4C28F300.1060506@drmicha.warpmail.net>
In-Reply-To
<AANLkTil6-rd5y9xcTVz4kJ4O2jL9ZdXYo1JrgYA3sM6N@mail.gmail.com>
Erez Zilber venit, vidit, dixit 28.06.2010 18:02:
Show 13 quoted lines
> Hi,
> 
> I saw that I can run git log with '--cherry-pick'. With this, if I run
> "git log --cherry-pick branch_a..branch_b", it doesn't show
> differences that are caused by cherry picks.
> 
> My question is: sometimes, cherry picking from branch_a to branch_b is
> not immediate, and I need to adapt the patch that was committed on
> branch_a to apply on branch_b. In other cases, git is able to apply
> the patch on branch_b automatically (e.g. if there's only a line
> offset). In such cases, will "git log --cherry-pick" ignore these
> cherry-picks like it ignores cherry-picks that were applied without
> any problem?

With --cherry-pick, log omits those commits whose associated patch has the same patch-id (see "git patch-id").

Michael
Previous: Erez ZilberNext: Erez Zilber
Message 2 of 4 in “git log and cherry-picks”
  1. Erez ZilberJun 28, 2010
  2. Michael J GruberJun 28, 2010
  3. Erez ZilberJun 28, 2010
  4. Antriksh PanyJul 5, 2010

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.