mirror of
https://github.com/git/git.git
synced 2024-11-01 23:07:55 +01:00
7791a1d9b9
The SYNOPSIS sections of most commands that span several lines already use [verse] to retain line breaks. Most commands that don't span several lines seem not to use [verse]. In the HTML output, [verse] does not only preserve line breaks, but also makes the section indented, which causes a slight inconsistency between commands that use [verse] and those that don't. Use [verse] in all SYNOPSIS sections for consistency. Also remove the blank lines from git-fetch.txt and git-rebase.txt to align with the other man pages. In the case of git-rebase.txt, which already uses [verse], the blank line makes the [verse] not apply to the last line, so removing the blank line also makes the formatting within the document more consistent. While at it, add single quotes to 'git cvsimport' for consistency with other commands. Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
69 lines
1.7 KiB
Text
69 lines
1.7 KiB
Text
git-cherry(1)
|
|
=============
|
|
|
|
NAME
|
|
----
|
|
git-cherry - Find commits not merged upstream
|
|
|
|
SYNOPSIS
|
|
--------
|
|
[verse]
|
|
'git cherry' [-v] [<upstream> [<head> [<limit>]]]
|
|
|
|
DESCRIPTION
|
|
-----------
|
|
The changeset (or "diff") of each commit between the fork-point and <head>
|
|
is compared against each commit between the fork-point and <upstream>.
|
|
The commits are compared with their 'patch id', obtained from
|
|
the 'git patch-id' program.
|
|
|
|
Every commit that doesn't exist in the <upstream> branch
|
|
has its id (sha1) reported, prefixed by a symbol. The ones that have
|
|
equivalent change already
|
|
in the <upstream> branch are prefixed with a minus (-) sign, and those
|
|
that only exist in the <head> branch are prefixed with a plus (+) symbol:
|
|
|
|
__*__*__*__*__> <upstream>
|
|
/
|
|
fork-point
|
|
\__+__+__-__+__+__-__+__> <head>
|
|
|
|
|
|
If a <limit> has been given then the commits along the <head> branch up
|
|
to and including <limit> are not reported:
|
|
|
|
__*__*__*__*__> <upstream>
|
|
/
|
|
fork-point
|
|
\__*__*__<limit>__-__+__> <head>
|
|
|
|
|
|
Because 'git cherry' compares the changeset rather than the commit id
|
|
(sha1), you can use 'git cherry' to find out if a commit you made locally
|
|
has been applied <upstream> under a different commit id. For example,
|
|
this will happen if you're feeding patches <upstream> via email rather
|
|
than pushing or pulling commits directly.
|
|
|
|
|
|
OPTIONS
|
|
-------
|
|
-v::
|
|
Verbose.
|
|
|
|
<upstream>::
|
|
Upstream branch to compare against.
|
|
Defaults to the first tracked remote branch, if available.
|
|
|
|
<head>::
|
|
Working branch; defaults to HEAD.
|
|
|
|
<limit>::
|
|
Do not report commits up to (and including) limit.
|
|
|
|
SEE ALSO
|
|
--------
|
|
linkgit:git-patch-id[1]
|
|
|
|
GIT
|
|
---
|
|
Part of the linkgit:git[1] suite
|