diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-10-15 11:40:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-15 11:40:25 -0700 |
| commit | 369e340f234cf9372003f0e912c6fa14f3e970fc (patch) | |
| tree | 7f0c2cdeb1043a4a25b65d721220eac32af407f1 /git-cherry.txt | |
| parent | 79f4c7c3c9b29ade5534a5f1d01db2c67721d6a8 (diff) | |
| download | git-htmldocs-369e340f234cf9372003f0e912c6fa14f3e970fc.tar.gz | |
Autogenerated HTML docs for v1.8.4-554-g2b7ca9
Diffstat (limited to 'git-cherry.txt')
| -rw-r--r-- | git-cherry.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/git-cherry.txt b/git-cherry.txt index f6c19c734..2d0daae62 100644 --- a/git-cherry.txt +++ b/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 |