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

Re: How to resolve git-am conflict (possible bug)

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Aug 12, 2006, 09:52 UTC
Message-ID
<Pine.LNX.4.63.0608121146550.10541@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To
<ebk5tf$31k$1@sea.gmane.org>
Hi,
On Sat, 12 Aug 2006, Jakub Narebski wrote:
> Why do we not record commit id in patch?
Because we do not have to.

There is a commit SHA1 which guarantees the integrity of the commit, and then you can generate the patch-id with

	$ git show $commit | git patch-id
> And how git-rebase deals with this?

AFAICT by cherry-picking the commit, and if nothing changed in the index, just ignoring the patch.

Hth, Dscho

Previous: Junio C HamanoNext: Junio C Hamano
Message 7 of 8 in “How to resolve git-am conflict (possible bug)”
  1. Jakub NarebskiAug 12, 2006
  2. Junio C HamanoAug 12, 2006
  3. Junio C HamanoAug 12, 2006
  4. Jakub NarebskiAug 12, 2006
  5. Jakub NarebskiAug 12, 2006
  6. Junio C HamanoAug 12, 2006
  7. Johannes SchindelinAug 12, 2006
  8. Junio C HamanoAug 12, 2006

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.