From ccba805681b1b3c3ce4f053f20171b04ced2037a Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" Date: Wed, 25 Sep 2013 01:33:36 +0300 Subject: [PATCH] doc: don't claim that cherry calls patch-id The id is already different for binary files. The hash used is an implementation detail, so let's just document how diffs are compared. Signed-off-by: Michael S. Tsirkin Signed-off-by: Jonathan Nieder --- 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 f6c19c734d..2d0daae626 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 -- 2.11.4.GIT