threads / patch / 35012

v2doc: don't claim that cherry calls patch-id

Subject: [PATCH v2] doc: don't claim that cherry calls patch-id

## tl;dr

One message between Sep 24, 2013 and Sep 24, 2013. Diffs are folded; open one to read it.

replies: 0people: 1as markdown or json

Michael S. Tsirkin· Sep 24, 2013, 22:33 UTC · lore

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 <jrnieder@gmail.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
Changes from v1:
	address comments by Jonathan
 Documentation/git-cherry.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
Show changes to Documentation/git-cherry.txt +1 −2
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 <head>
 is compared against each commit between the fork-point and <upstream>.
-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 <upstream> branch
 has its id (sha1) reported, prefixed by a symbol.  The ones that have
-- 
MST

← back to recent threads