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

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