summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorThomas Rast <trast@student.ethz.ch>2010-01-09 23:33:00 (GMT)
committerThomas Rast <trast@student.ethz.ch>2010-01-10 12:01:28 (GMT)
commit0b444cdb19bcfcc7f59b7b00783cbfbbc5ddcf63 (patch)
treefbc79ccb4f6e809a560bd807c4a17dd6e6681161 /Documentation/merge-options.txt
parentca768288b650a4929bc1d58783a929a9a792e30e (diff)
downloadgit-0b444cdb19bcfcc7f59b7b00783cbfbbc5ddcf63.zip
git-0b444cdb19bcfcc7f59b7b00783cbfbbc5ddcf63.tar.gz
git-0b444cdb19bcfcc7f59b7b00783cbfbbc5ddcf63.tar.bz2
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/merge-options.txt')
-rw-r--r--Documentation/merge-options.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index fec3394..5064bf8 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -59,8 +59,8 @@ option can be used to override --squash.
Use the given merge strategy; can be supplied more than
once to specify them in the order they should be tried.
If there is no `-s` option, a built-in list of strategies
- is used instead ('git-merge-recursive' when merging a single
- head, 'git-merge-octopus' otherwise).
+ is used instead ('git merge-recursive' when merging a single
+ head, 'git merge-octopus' otherwise).
--summary::
--no-summary::