diff options
| author | Thomas Rast <trast@student.ethz.ch> | 2010-01-10 00:33:00 +0100 |
|---|---|---|
| committer | Thomas Rast <trast@student.ethz.ch> | 2010-01-10 13:01:28 +0100 |
| commit | 0b444cdb19bcfcc7f59b7b00783cbfbbc5ddcf63 (patch) | |
| tree | fbc79ccb4f6e809a560bd807c4a17dd6e6681161 /Documentation/git-cherry.txt | |
| parent | ca768288b650a4929bc1d58783a929a9a792e30e (diff) | |
| download | git-0b444cdb19bcfcc7f59b7b00783cbfbbc5ddcf63.tar.gz git-0b444cdb19bcfcc7f59b7b00783cbfbbc5ddcf63.tar.xz | |
Documentation: spell 'git cmd' without dash throughout
The documentation was quite inconsistent when spelling 'git cmd' if it
only refers to the program, not to some specific invocation syntax:
both 'git-cmd' and 'git cmd' spellings exist.
The current trend goes towards dashless forms, and there is precedent
in 647ac70 (git-svn.txt: stop using dash-form of commands.,
2009-07-07) to actively eliminate the dashed variants.
Replace 'git-cmd' with 'git cmd' throughout, except where git-shell,
git-cvsserver, git-upload-pack, git-receive-pack, and
git-upload-archive are concerned, because those really live in the
$PATH.
Diffstat (limited to 'Documentation/git-cherry.txt')
| -rw-r--r-- | Documentation/git-cherry.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-cherry.txt b/Documentation/git-cherry.txt index 7deefdae8..fed115acd 100644 --- a/Documentation/git-cherry.txt +++ b/Documentation/git-cherry.txt @@ -14,7 +14,7 @@ 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. +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 @@ -37,8 +37,8 @@ to and including <limit> are not reported: \__*__*__<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 +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. |