projects / thirdparty / git.git / blame
| Commit | Line | Data |
|---|---|---|
| 7fc9d69f JH |
1 | git-cherry(1) |
| 2 | ============= | |
| 3 | ||
| 4 | NAME | |
| 5 | ---- | |
| 7bd7f280 | 6 | git-cherry - Find commits not merged upstream |
| 7fc9d69f JH |
7 | |
| 8 | SYNOPSIS | |
| 9 | -------- | |
| 7791a1d9 | 10 | [verse] |
| 3bc52d7a | 11 | 'git cherry' [-v] [<upstream> [<head> [<limit>]]] |
| 7fc9d69f JH |
12 | |
| 13 | DESCRIPTION | |
| 14 | ----------- | |
| 81ae43cd SE |
15 | The changeset (or "diff") of each commit between the fork-point and <head> |
| 16 | is compared against each commit between the fork-point and <upstream>. | |
| 483bc4f0 | 17 | The commits are compared with their 'patch id', obtained from |
| 0b444cdb | 18 | the 'git patch-id' program. |
| 81ae43cd | 19 | |
| 6e7d76ba JH |
20 | Every commit that doesn't exist in the <upstream> branch |
| 21 | has its id (sha1) reported, prefixed by a symbol. The ones that have | |
| 22 | equivalent change already | |
| 81ae43cd | 23 | in the <upstream> branch are prefixed with a minus (-) sign, and those |
| a8ebdb90 RS |
24 | that only exist in the <head> branch are prefixed with a plus (+) symbol: |
| 25 | ||
| 26 | __*__*__*__*__> <upstream> | |
| 27 | / | |
| 28 | fork-point | |
| 29 | \__+__+__-__+__+__-__+__> <head> | |
| 30 | ||
| 31 | ||
| 32 | If a <limit> has been given then the commits along the <head> branch up | |
| 33 | to and including <limit> are not reported: | |
| 34 | ||
| 35 | __*__*__*__*__> <upstream> | |
| 36 | / | |
| 37 | fork-point | |
| 38 | \__*__*__<limit>__-__+__> <head> | |
| 39 | ||
| 81ae43cd | 40 | |
| 0b444cdb TR |
41 | Because 'git cherry' compares the changeset rather than the commit id |
| 42 | (sha1), you can use 'git cherry' to find out if a commit you made locally | |
| 81ae43cd SE |
43 | has been applied <upstream> under a different commit id. For example, |
| 44 | this will happen if you're feeding patches <upstream> via email rather | |
| 45 | than pushing or pulling commits directly. | |
| 46 | ||
| 7fc9d69f JH |
47 | |
| 48 | OPTIONS | |
| 49 | ------- | |
| 52a22d1e LAS |
50 | -v:: |
| 51 | Verbose. | |
| 7fc9d69f | 52 | |
| 52a22d1e LAS |
53 | <upstream>:: |
| 54 | Upstream branch to compare against. | |
| f2968022 | 55 | Defaults to the first tracked remote branch, if available. |
| 7fc9d69f | 56 | |
| 52a22d1e LAS |
57 | <head>:: |
| 58 | Working branch; defaults to HEAD. | |
| 7fc9d69f | 59 | |
| 6894f49f LFC |
60 | <limit>:: |
| 61 | Do not report commits up to (and including) limit. | |
| 62 | ||
| a7052d35 JH |
63 | SEE ALSO |
| 64 | -------- | |
| 65 | linkgit:git-patch-id[1] | |
| 66 | ||
| 7fc9d69f JH |
67 | GIT |
| 68 | --- | |
| 9e1f0a85 | 69 | Part of the linkgit:git[1] suite |