diff options
| author |  Michael S. Tsirkin <mst@redhat.com> | 2013-09-25 01:33:36 +0300 |
|---|---|---|
| committer |  Jonathan Nieder <jrnieder@gmail.com> | 2013-09-24 15:54:48 -0700 |
| commit | ccba805681b1b3c3ce4f053f20171b04ced2037a (patch) | |
| tree | 14b0d2bd51da28225bba2d055c99153e1ab1dca5 /Documentation/git-cherry.txt | |
| parent | sample pre-commit hook: use --bool when retrieving config var (diff) | |
| download | tgif-ccba805681b1b3c3ce4f053f20171b04ced2037a.tar.xz | |
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 <mst@redhat.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Diffstat (limited to 'Documentation/git-cherry.txt')
| -rw-r--r-- | Documentation/git-cherry.txt | 3 |
1 files changed, 1 insertions, 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 <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 |