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.html | |
| parent | 79f4c7c3c9b29ade5534a5f1d01db2c67721d6a8 (diff) | |
| download | git-htmldocs-369e340f234cf9372003f0e912c6fa14f3e970fc.tar.gz | |
Autogenerated HTML docs for v1.8.4-554-g2b7ca9
Diffstat (limited to 'git-cherry.html')
| -rw-r--r-- | git-cherry.html | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/git-cherry.html b/git-cherry.html index a7066c0f6..e1d2cc49b 100644 --- a/git-cherry.html +++ b/git-cherry.html @@ -756,8 +756,7 @@ git-cherry(1) Manual Page <div class="sectionbody">
<div class="paragraph"><p>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 <em>patch id</em>, obtained from
-the <em>git patch-id</em> program.</p></div>
+The diffs are compared after removing any whitespace and line numbers.</p></div>
<div class="paragraph"><p>Every commit that doesn’t exist in the <upstream> branch
has its id (sha1) reported, prefixed by a symbol. The ones that have
equivalent change already
@@ -842,7 +841,7 @@ than pushing or pulling commits directly.</p></div> <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2013-08-20 08:40:27 PDT
+Last updated 2013-10-15 11:39:58 PDT
</div>
</div>
</body>
|