Skip to content
This repository was archived by the owner on Nov 9, 2017. It is now read-only.

Commit ccba805

Browse files
mstsirkinjrn
authored andcommitted
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 <[email protected]> Signed-off-by: Jonathan Nieder <[email protected]>
1 parent af1748b commit ccba805

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

Documentation/git-cherry.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ DESCRIPTION
1414
-----------
1515
The changeset (or "diff") of each commit between the fork-point and <head>
1616
is compared against each commit between the fork-point and <upstream>.
17-
The commits are compared with their 'patch id', obtained from
18-
the 'git patch-id' program.
17+
The diffs are compared after removing any whitespace and line numbers.
1918

2019
Every commit that doesn't exist in the <upstream> branch
2120
has its id (sha1) reported, prefixed by a symbol. The ones that have

0 commit comments

Comments
 (0)