From: Michael S. Tsirkin Date: Tue, 24 Sep 2013 22:05:40 GMT Subject: [PATCH] doc: don't claim that cherry-pick calls patch-id Message-ID: <1380060333-2226-1-git-send-email-mst@redhat.com> The id is already different for binary files. Let's document that they are similar, not identical. Cc: Jonathan Nieder Signed-off-by: Michael S. Tsirkin --- Documentation/git-cherry.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt index f6c19c7..66ff52f 100644 --- a/Documentation/git-cherry.txt +++ b/Documentation/git-cherry.txt @@ -13,12 +13,13 @@ SYNOPSIS DESCRIPTION ----------- The changeset (or "diff") of each commit between the fork-point and -is compared against each commit between the fork-point and . -The commits are compared with their 'patch id', obtained from -the 'git patch-id' program. +is compared against diff of each commit between the fork-point and . +The diffs are compared with their diff id (sha1) calculated after removing +any whitespace and line numbers (similar but not necessarily identical +to 'patch id', obtained from the 'git patch-id' program). Every commit that doesn't exist in the branch -has its id (sha1) reported, prefixed by a symbol. The ones that have +has its diff id (sha1) reported, prefixed by a symbol. The ones that have equivalent change already in the branch are prefixed with a minus (-) sign, and those that only exist in the branch are prefixed with a plus (+) symbol: -- MST