]>
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 | -------- | |
a8ebdb90 | 10 | 'git-cherry' [-v] <upstream> [<head>] [<limit>] |
7fc9d69f JH |
11 | |
12 | DESCRIPTION | |
13 | ----------- | |
81ae43cd SE |
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>. | |
16 | ||
6e7d76ba JH |
17 | Every commit that doesn't exist in the <upstream> branch |
18 | has its id (sha1) reported, prefixed by a symbol. The ones that have | |
19 | equivalent change already | |
81ae43cd | 20 | in the <upstream> branch are prefixed with a minus (-) sign, and those |
a8ebdb90 RS |
21 | that only exist in the <head> branch are prefixed with a plus (+) symbol: |
22 | ||
23 | __*__*__*__*__> <upstream> | |
24 | / | |
25 | fork-point | |
26 | \__+__+__-__+__+__-__+__> <head> | |
27 | ||
28 | ||
29 | If a <limit> has been given then the commits along the <head> branch up | |
30 | to and including <limit> are not reported: | |
31 | ||
32 | __*__*__*__*__> <upstream> | |
33 | / | |
34 | fork-point | |
35 | \__*__*__<limit>__-__+__> <head> | |
36 | ||
81ae43cd SE |
37 | |
38 | Because git-cherry compares the changeset rather than the commit id | |
39 | (sha1), you can use git-cherry to find out if a commit you made locally | |
40 | has been applied <upstream> under a different commit id. For example, | |
41 | this will happen if you're feeding patches <upstream> via email rather | |
42 | than pushing or pulling commits directly. | |
43 | ||
7fc9d69f JH |
44 | |
45 | OPTIONS | |
46 | ------- | |
52a22d1e LAS |
47 | -v:: |
48 | Verbose. | |
7fc9d69f | 49 | |
52a22d1e LAS |
50 | <upstream>:: |
51 | Upstream branch to compare against. | |
7fc9d69f | 52 | |
52a22d1e LAS |
53 | <head>:: |
54 | Working branch; defaults to HEAD. | |
7fc9d69f JH |
55 | |
56 | Author | |
57 | ------ | |
58 | Written by Junio C Hamano <junkio@cox.net> | |
59 | ||
60 | Documentation | |
61 | -------------- | |
62 | Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>. | |
63 | ||
64 | GIT | |
65 | --- | |
a7154e91 | 66 | Part of the gitlink:git[7] suite |