From: Michael S. Tsirkin Date: Tue, 24 Sep 2013 22:33:36 GMT Subject: [PATCH v2] doc: don't claim that cherry calls patch-id Message-ID: <1380061947-2353-1-git-send-email-mst@redhat.com> The id is already different for binary files. The hash used is an implementation detail, so let's just document how diffs are compared. Cc: Jonathan Nieder Signed-off-by: Michael S. Tsirkin --- Changes from v1: address comments by Jonathan Documentation/git-cherry.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt index f6c19c7..2d0daae 100644 --- a/Documentation/git-cherry.txt +++ b/Documentation/git-cherry.txt @@ -14,8 +14,7 @@ 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. +The diffs are compared after removing any whitespace and line numbers. Every commit that doesn't exist in the branch has its id (sha1) reported, prefixed by a symbol. The ones that have -- MST