Re: [PATCH] doc: don't claim that cherry-pick calls patch-id

2013-09-24 Thread Michael S. Tsirkin
On Tue, Sep 24, 2013 at 03:53:56PM -0700, Jonathan Nieder wrote: > Michael S. Tsirkin wrote: > > > See v2 that I sent, maybe that's clear enough. > > Yep, looks sensible. Thanks. OK, ack that please :) -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to

Re: [PATCH] doc: don't claim that cherry-pick calls patch-id

2013-09-24 Thread Jonathan Nieder
Michael S. Tsirkin wrote: > See v2 that I sent, maybe that's clear enough. Yep, looks sensible. Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH] doc: don't claim that cherry-pick calls patch-id

2013-09-24 Thread Michael S. Tsirkin
On Tue, Sep 24, 2013 at 03:44:31PM -0700, Jonathan Nieder wrote: > Michael S. Tsirkin wrote: > > On Tue, Sep 24, 2013 at 03:14:09PM -0700, Jonathan Nieder wrote: > >> Michael S. Tsirkin wrote: > > >>> -The commits are compared with their 'patch id', obtained from > >>> -the 'git patch-id' program.

Re: [PATCH] doc: don't claim that cherry-pick calls patch-id

2013-09-24 Thread Jonathan Nieder
Michael S. Tsirkin wrote: > On Tue, Sep 24, 2013 at 03:14:09PM -0700, Jonathan Nieder wrote: >> Michael S. Tsirkin wrote: >>> -The commits are compared with their 'patch id', obtained from >>> -the 'git patch-id' program. >>> +The diffs are compared with their diff id (sha1) calculated after remov

Re: [PATCH] doc: don't claim that cherry-pick calls patch-id

2013-09-24 Thread Michael S. Tsirkin
On Tue, Sep 24, 2013 at 03:14:09PM -0700, Jonathan Nieder wrote: > Michael S. Tsirkin wrote: > > > Subject: [PATCH] doc: don't claim that cherry-pick calls patch-id > > s/cherry-pick/cherry/ > > > The id is already different for binary files. > > Let's document that they are similar, not identic

Re: [PATCH] doc: don't claim that cherry-pick calls patch-id

2013-09-24 Thread Jonathan Nieder
Michael S. Tsirkin wrote: > Subject: [PATCH] doc: don't claim that cherry-pick calls patch-id s/cherry-pick/cherry/ > The id is already different for binary files. > Let's document that they are similar, not identical. Thanks. [...] > --- a/Documentation/git-cherry.txt > +++ b/Documentation/gi