]> git.ipfire.org Git - thirdparty/git.git/blame - Documentation/git-cherry.txt
Merge branch 'jc/combined' into maint
[thirdparty/git.git] / Documentation / git-cherry.txt
CommitLineData
7fc9d69f
JH
1git-cherry(1)
2=============
3
4NAME
5----
7bd7f280 6git-cherry - Find commits not merged upstream
7fc9d69f
JH
7
8SYNOPSIS
9--------
52a22d1e 10'git-cherry' [-v] <upstream> [<head>]
7fc9d69f
JH
11
12DESCRIPTION
13-----------
81ae43cd
SE
14The changeset (or "diff") of each commit between the fork-point and <head>
15is compared against each commit between the fork-point and <upstream>.
16
6e7d76ba
JH
17Every commit that doesn't exist in the <upstream> branch
18has its id (sha1) reported, prefixed by a symbol. The ones that have
19equivalent change already
81ae43cd
SE
20in the <upstream> branch are prefixed with a minus (-) sign, and those
21that only exist in the <head> branch are prefixed with a plus (+) symbol.
22
23Because git-cherry compares the changeset rather than the commit id
24(sha1), you can use git-cherry to find out if a commit you made locally
25has been applied <upstream> under a different commit id. For example,
26this will happen if you're feeding patches <upstream> via email rather
27than pushing or pulling commits directly.
28
7fc9d69f
JH
29
30OPTIONS
31-------
52a22d1e
LAS
32-v::
33 Verbose.
7fc9d69f 34
52a22d1e
LAS
35<upstream>::
36 Upstream branch to compare against.
7fc9d69f 37
52a22d1e
LAS
38<head>::
39 Working branch; defaults to HEAD.
7fc9d69f
JH
40
41Author
42------
43Written by Junio C Hamano <junkio@cox.net>
44
45Documentation
46--------------
47Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
48
49GIT
50---
a7154e91 51Part of the gitlink:git[7] suite
7fc9d69f 52