| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 1 | git-cherry(1) |
| 2 | ============= |
| 3 | |
| 4 | NAME |
| 5 | ---- |
| Junio C Hamano | 0107892 | 2006-03-10 00:31:47 | [diff] [blame] | 6 | git-cherry - Find commits not merged upstream |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 7 | |
| 8 | SYNOPSIS |
| 9 | -------- |
| Junio C Hamano | fce7c7e | 2008-07-02 03:06:38 | [diff] [blame] | 10 | 'git cherry' [-v] <upstream> [<head>] [<limit>] |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 11 | |
| 12 | DESCRIPTION |
| 13 | ----------- |
| Junio C Hamano | 1bb569e | 2006-05-05 23:14:25 | [diff] [blame] | 14 | The changeset (or "diff") of each commit between the fork-point and <head> |
| 15 | is compared against each commit between the fork-point and <upstream>. |
| Junio C Hamano | fce7c7e | 2008-07-02 03:06:38 | [diff] [blame] | 16 | The commits are compared with their 'patch id', obtained from |
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 17 | the 'git-patch-id' program. |
| Junio C Hamano | 1bb569e | 2006-05-05 23:14:25 | [diff] [blame] | 18 | |
| Junio C Hamano | ff4b431 | 2006-10-25 22:55:31 | [diff] [blame] | 19 | Every commit that doesn't exist in the <upstream> branch |
| 20 | has its id (sha1) reported, prefixed by a symbol. The ones that have |
| 21 | equivalent change already |
| Junio C Hamano | 1bb569e | 2006-05-05 23:14:25 | [diff] [blame] | 22 | in the <upstream> branch are prefixed with a minus (-) sign, and those |
| Junio C Hamano | a053d54 | 2006-10-27 09:29:13 | [diff] [blame] | 23 | that only exist in the <head> branch are prefixed with a plus (+) symbol: |
| 24 | |
| 25 | __*__*__*__*__> <upstream> |
| 26 | / |
| 27 | fork-point |
| 28 | \__+__+__-__+__+__-__+__> <head> |
| 29 | |
| 30 | |
| 31 | If a <limit> has been given then the commits along the <head> branch up |
| 32 | to and including <limit> are not reported: |
| 33 | |
| 34 | __*__*__*__*__> <upstream> |
| 35 | / |
| 36 | fork-point |
| 37 | \__*__*__<limit>__-__+__> <head> |
| 38 | |
| Junio C Hamano | 1bb569e | 2006-05-05 23:14:25 | [diff] [blame] | 39 | |
| Junio C Hamano | ba4b928 | 2008-07-06 05:20:31 | [diff] [blame] | 40 | Because 'git-cherry' compares the changeset rather than the commit id |
| 41 | (sha1), you can use 'git-cherry' to find out if a commit you made locally |
| Junio C Hamano | 1bb569e | 2006-05-05 23:14:25 | [diff] [blame] | 42 | has been applied <upstream> under a different commit id. For example, |
| 43 | this will happen if you're feeding patches <upstream> via email rather |
| 44 | than pushing or pulling commits directly. |
| 45 | |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 46 | |
| 47 | OPTIONS |
| 48 | ------- |
| 49 | -v:: |
| 50 | Verbose. |
| 51 | |
| 52 | <upstream>:: |
| 53 | Upstream branch to compare against. |
| 54 | |
| 55 | <head>:: |
| 56 | Working branch; defaults to HEAD. |
| 57 | |
| Junio C Hamano | 16f9887 | 2007-06-12 16:09:14 | [diff] [blame] | 58 | <limit>:: |
| 59 | Do not report commits up to (and including) limit. |
| 60 | |
| Junio C Hamano | 9049d91 | 2008-05-29 02:09:50 | [diff] [blame] | 61 | SEE ALSO |
| 62 | -------- |
| 63 | linkgit:git-patch-id[1] |
| 64 | |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 65 | Author |
| 66 | ------ |
| Junio C Hamano | 0868a30 | 2008-07-22 09:20:44 | [diff] [blame] | 67 | Written by Junio C Hamano <gitster@pobox.com> |
| Junio C Hamano | 1a4e841 | 2005-12-27 08:17:23 | [diff] [blame] | 68 | |
| 69 | Documentation |
| 70 | -------------- |
| 71 | Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. |
| 72 | |
| 73 | GIT |
| 74 | --- |
| Junio C Hamano | f7c042d | 2008-06-06 22:50:53 | [diff] [blame] | 75 | Part of the linkgit:git[1] suite |
