summaryrefslogtreecommitdiff
path: root/Documentation/git-cherry.txt
diff options
context:
space:
mode:
authorA Large Angry SCM <gitzilla@gmail.com>2005-08-27 01:18:48 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-27 03:53:50 (GMT)
commit52a22d1e726f91b0ba4ea0afb7cfbfaaf624127b (patch)
treeb815188ded9ace02c6b0bce9a07451b44e0df1f5 /Documentation/git-cherry.txt
parent85002315798dfcd28da6120ac3a461ca3fadfd2e (diff)
downloadgit-52a22d1e726f91b0ba4ea0afb7cfbfaaf624127b.zip
git-52a22d1e726f91b0ba4ea0afb7cfbfaaf624127b.tar.gz
git-52a22d1e726f91b0ba4ea0afb7cfbfaaf624127b.tar.bz2
[PATCH] Subject: [PATCH] Add some documentation.
Add some documentation. Text taken from the the commit messages and the command sources.
Diffstat (limited to 'Documentation/git-cherry.txt')
-rw-r--r--Documentation/git-cherry.txt22
1 files changed, 13 insertions, 9 deletions
diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt
index 14d0bd5..9ff7bc2 100644
--- a/Documentation/git-cherry.txt
+++ b/Documentation/git-cherry.txt
@@ -3,26 +3,30 @@ git-cherry(1)
NAME
----
-git-cherry - Some git command not yet documented.
-
+git-cherry - Find commits not merged upstream.
SYNOPSIS
--------
-'git-cherry' [ --option ] <args>...
+'git-cherry' [-v] <upstream> [<head>]
DESCRIPTION
-----------
-Does something not yet documented.
-
+Each commit between the fork-point and <head> is examined, and compared against
+the change each commit between the fork-point and <upstream> introduces.
+Commits already included in upstream are prefixed with '-' (meaning "drop from
+my local pull"), while commits missing from upstream are prefixed with '+'
+(meaning "add to the updated upstream").
OPTIONS
-------
---option::
- Some option not yet documented.
+-v::
+ Verbose.
-<args>...::
- Some argument not yet documented.
+<upstream>::
+ Upstream branch to compare against.
+<head>::
+ Working branch; defaults to HEAD.
Author
------