From: Michael S. Tsirkin Date: Tue, 24 Sep 2013 22:33:36 +0000 (+0300) Subject: doc: don't claim that cherry calls patch-id X-Git-Tag: v1.8.5-rc0~86 X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=ccba805681b1b3c3ce4f053f20171b04ced2037a;p=git.git 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 --- 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