Skip to content

Commit

Permalink
doc: don't claim that cherry calls patch-id
Browse files Browse the repository at this point in the history 
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 <mst@redhat.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
  • Loading branch information
Michael S. Tsirkin authored and Jonathan Nieder committed Sep 24, 2013
1 parent af1748b commit ccba805
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions Documentation/git-cherry.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ccba805

Please sign in to comment.