{"thread":{"id":"4074","subject":"[PATCH] Clarify git-cherry documentation.","startedAt":"2006-05-05T19:06:07Z","lastAt":"2006-05-05T19:06:07Z","messageCount":1,"participants":["sean"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"19580","messageId":"BAYC1-PASMTP025E7E0DC9041B161452AAAEB50@CEZ.ICE","threadId":"4074","inReplyTo":null,"subject":"[PATCH] Clarify git-cherry documentation.","fromName":"sean","fromEmail":"seanlkml@sympatico.ca","sentAt":"2006-05-05T19:06:07Z","receivedAt":"2006-05-05T19:06:07Z","isPatch":true,"sender":{"key":"seanlkml@sympatico.ca","avatar":"https://gravatar.com/avatar/f92923f54fc08c401fc59b71829d4b89e9b8087fbba45ff87c82e6a83aee02ae?d=mp&s=160"},"body":"Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>\n\n\n---\n\n Documentation/git-cherry.txt |   19 ++++++++++++++-----\n 1 files changed, 14 insertions(+), 5 deletions(-)\n\n6978ad8b3935b8ce2c55da65b099c67a32ff94d0\ndiff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt\nindex 9a5e371..893baaa 100644\n--- a/Documentation/git-cherry.txt\n+++ b/Documentation/git-cherry.txt\n@@ -11,11 +11,20 @@ SYNOPSIS\n \n DESCRIPTION\n -----------\n-Each commit between the fork-point and <head> is examined, and compared against\n-the change each commit between the fork-point and <upstream> introduces.\n-Commits already included in upstream are prefixed with '-' (meaning \"drop from\n-my local pull\"), while commits missing from upstream are prefixed with '+'\n-(meaning \"add to the updated upstream\").\n+The changeset (or \"diff\") of each commit between the fork-point and <head>\n+is compared against each commit between the fork-point and <upstream>.\n+\n+Every commit with a changeset that doesn't exist in the other branch\n+has its id (sha1) reported, prefixed by a symbol.  Those existing only\n+in the <upstream> branch are prefixed with a minus (-) sign, and those\n+that only exist in the <head> branch are prefixed with a plus (+) symbol.\n+\n+Because git-cherry compares the changeset rather than the commit id\n+(sha1), you can use git-cherry to find out if a commit you made locally\n+has been applied <upstream> under a different commit id.  For example,\n+this will happen if you're feeding patches <upstream> via email rather\n+than pushing or pulling commits directly.\n+\n \n OPTIONS\n -------\n-- \n1.3.1.g9c203\n"}]}