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/gitworkflows.txt | |
parent | Documentation: format full commands in typewriter font (diff) | |
download | git-0b444cdb19bcfcc7f59b7b00783cbfbbc5ddcf63.tar.xz git-0b444cdb19bcfcc7f59b7b00783cbfbbc5ddcf63.zip |
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/gitworkflows.txt')
-rw-r--r-- | Documentation/gitworkflows.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/gitworkflows.txt b/Documentation/gitworkflows.txt index 065441df64..1ef55fffcf 100644 --- a/Documentation/gitworkflows.txt +++ b/Documentation/gitworkflows.txt @@ -360,7 +360,7 @@ There are three main tools that can be used for this: * linkgit:git-pull[1] that does fetch and merge in one go. -Note the last point. Do 'not' use 'git-pull' unless you actually want +Note the last point. Do 'not' use 'git pull' unless you actually want to merge the remote branch. Getting changes out is easy: @@ -397,7 +397,7 @@ Please pull from <url> <branch> ------------------------------------- -In that case, 'git-pull' can do the fetch and merge in one go, as +In that case, 'git pull' can do the fetch and merge in one go, as follows. .Push/pull: Merging remote topics @@ -449,7 +449,7 @@ problem. If you receive such a patch series (as maintainer, or perhaps as a reader of the mailing list it was sent to), save the mails to files, -create a new topic branch and use 'git-am' to import the commits: +create a new topic branch and use 'git am' to import the commits: .format-patch/am: Importing patches [caption="Recipe: "] |