Skip to content

Commit 0b444cd

Browse files
trasttrast
committed
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.
1 parent ca76828 commit 0b444cd

File tree

112 files changed

+647
-647
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+647
-647
lines changed

‎Documentation/config.txt‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ The values following the equals sign in variable assign are all either
6464
a string, an integer, or a boolean. Boolean values may be given as yes/no,
6565
0/1, true/false or on/off. Case is not significant in boolean values, when
6666
converting value to the canonical form using '--bool' type specifier;
67-
'git-config' will ensure that the output is "true" or "false".
67+
'git config' will ensure that the output is "true" or "false".
6868

6969
String values may be entirely or partially enclosed in double quotes.
7070
You need to enclose variable values in double quotes if you want to
@@ -442,8 +442,8 @@ core.pager::
442442

443443
core.whitespace::
444444
A comma separated list of common whitespace problems to
445-
notice. 'git-diff' will use `color.diff.whitespace` to
446-
highlight them, and 'git-apply --whitespace=error' will
445+
notice. 'git diff' will use `color.diff.whitespace` to
446+
highlight them, and 'git apply --whitespace=error' will
447447
consider them as errors. You can prefix `-` to disable
448448
any of them (e.g. `-trailing-space`):
449449
+
@@ -503,7 +503,7 @@ This setting defaults to "refs/notes/commits", and can be overridden by
503503
the `GIT_NOTES_REF` environment variable.
504504

505505
add.ignore-errors::
506-
Tells 'git-add' to continue adding files when some files cannot be
506+
Tells 'git add' to continue adding files when some files cannot be
507507
added due to indexing errors. Equivalent to the '--ignore-errors'
508508
option of linkgit:git-add[1].
509509

@@ -525,19 +525,19 @@ executed from the top-level directory of a repository, which may
525525
not necessarily be the current directory.
526526

527527
apply.ignorewhitespace::
528-
When set to 'change', tells 'git-apply' to ignore changes in
528+
When set to 'change', tells 'git apply' to ignore changes in
529529
whitespace, in the same way as the '--ignore-space-change'
530530
option.
531-
When set to one of: no, none, never, false tells 'git-apply' to
531+
When set to one of: no, none, never, false tells 'git apply' to
532532
respect all whitespace differences.
533533
See linkgit:git-apply[1].
534534

535535
apply.whitespace::
536-
Tells 'git-apply' how to handle whitespaces, in the same way
536+
Tells 'git apply' how to handle whitespaces, in the same way
537537
as the '--whitespace' option. See linkgit:git-apply[1].
538538

539539
branch.autosetupmerge::
540-
Tells 'git-branch' and 'git-checkout' to setup new branches
540+
Tells 'git branch' and 'git checkout' to setup new branches
541541
so that linkgit:git-pull[1] will appropriately merge from the
542542
starting point branch. Note that even if this option is not set,
543543
this behavior can be chosen per-branch using the `--track`
@@ -548,7 +548,7 @@ branch.autosetupmerge::
548548
branch. This option defaults to true.
549549

550550
branch.autosetuprebase::
551-
When a new branch is created with 'git-branch' or 'git-checkout'
551+
When a new branch is created with 'git branch' or 'git checkout'
552552
that tracks another branch, this variable tells git to set
553553
up pull to rebase instead of merge (see "branch.<name>.rebase").
554554
When `never`, rebase is never automatically set to true.
@@ -563,24 +563,24 @@ branch.autosetuprebase::
563563
This option defaults to never.
564564

565565
branch.<name>.remote::
566-
When in branch <name>, it tells 'git-fetch' and 'git-push' which
566+
When in branch <name>, it tells 'git fetch' and 'git push' which
567567
remote to fetch from/push to. It defaults to `origin` if no remote is
568568
configured. `origin` is also used if you are not on any branch.
569569

570570
branch.<name>.merge::
571571
Defines, together with branch.<name>.remote, the upstream branch
572-
for the given branch. It tells 'git-fetch'/'git-pull' which
573-
branch to merge and can also affect 'git-push' (see push.default).
574-
When in branch <name>, it tells 'git-fetch' the default
572+
for the given branch. It tells 'git fetch'/'git pull' which
573+
branch to merge and can also affect 'git push' (see push.default).
574+
When in branch <name>, it tells 'git fetch' the default
575575
refspec to be marked for merging in FETCH_HEAD. The value is
576576
handled like the remote part of a refspec, and must match a
577577
ref which is fetched from the remote given by
578578
"branch.<name>.remote".
579-
The merge information is used by 'git-pull' (which at first calls
580-
'git-fetch') to lookup the default branch for merging. Without
581-
this option, 'git-pull' defaults to merge the first refspec fetched.
579+
The merge information is used by 'git pull' (which at first calls
580+
'git fetch') to lookup the default branch for merging. Without
581+
this option, 'git pull' defaults to merge the first refspec fetched.
582582
Specify multiple values to get an octopus merge.
583-
If you wish to setup 'git-pull' so that it merges into <name> from
583+
If you wish to setup 'git pull' so that it merges into <name> from
584584
another branch in the local repository, you can point
585585
branch.<name>.merge to the desired branch, and use the special setting
586586
`.` (a period) for branch.<name>.remote.
@@ -673,7 +673,7 @@ color.interactive::
673673
colors only when the output is to the terminal. Defaults to false.
674674

675675
color.interactive.<slot>::
676-
Use customized color for 'git-add --interactive'
676+
Use customized color for 'git add --interactive'
677677
output. `<slot>` may be `prompt`, `header`, `help` or `error`, for
678678
four distinct types of normal output from interactive
679679
commands. The values of these variables may be specified as
@@ -718,14 +718,14 @@ commit.template::
718718
specified user's home directory.
719719

720720
diff.autorefreshindex::
721-
When using 'git-diff' to compare with work tree
721+
When using 'git diff' to compare with work tree
722722
files, do not consider stat-only change as changed.
723723
Instead, silently run `git update-index --refresh` to
724724
update the cached stat information for paths whose
725725
contents in the work tree match the contents in the
726726
index. This option defaults to true. Note that this
727-
affects only 'git-diff' Porcelain, and not lower level
728-
'diff' commands, such as 'git-diff-files'.
727+
affects only 'git diff' Porcelain, and not lower level
728+
'diff' commands, such as 'git diff-files'.
729729

730730
diff.external::
731731
If this config variable is set, diff generation is not
@@ -737,7 +737,7 @@ diff.external::
737737
your files, you might want to use linkgit:gitattributes[5] instead.
738738

739739
diff.mnemonicprefix::
740-
If set, 'git-diff' uses a prefix pair that is different from the
740+
If set, 'git diff' uses a prefix pair that is different from the
741741
standard "a/" and "b/" depending on what is being compared. When
742742
this configuration is in effect, reverse diff output also swaps
743743
the order of the prefixes:
@@ -754,7 +754,7 @@ diff.mnemonicprefix::
754754

755755
diff.renameLimit::
756756
The number of files to consider when performing the copy/rename
757-
detection; equivalent to the 'git-diff' option '-l'.
757+
detection; equivalent to the 'git diff' option '-l'.
758758

759759
diff.renames::
760760
Tells git to detect renames. If set to any boolean value, it
@@ -840,7 +840,7 @@ format.pretty::
840840
linkgit:git-whatchanged[1].
841841

842842
format.thread::
843-
The default threading style for 'git-format-patch'. Can be
843+
The default threading style for 'git format-patch'. Can be
844844
either a boolean value, `shallow` or `deep`. `shallow`
845845
threading makes every mail a reply to the head of the series,
846846
where the head is chosen from the cover letter, the
@@ -858,7 +858,7 @@ format.signoff::
858858

859859
gc.aggressiveWindow::
860860
The window size parameter used in the delta compression
861-
algorithm used by 'git-gc --aggressive'. This defaults
861+
algorithm used by 'git gc --aggressive'. This defaults
862862
to 10.
863863

864864
gc.auto::
@@ -875,39 +875,39 @@ gc.autopacklimit::
875875
default value is 50. Setting this to 0 disables it.
876876

877877
gc.packrefs::
878-
'git-gc' does not run `git pack-refs` in a bare repository by
878+
'git gc' does not run `git pack-refs` in a bare repository by
879879
default so that older dumb-transport clients can still fetch
880-
from the repository. Setting this to `true` lets 'git-gc'
880+
from the repository. Setting this to `true` lets 'git gc'
881881
to run `git pack-refs`. Setting this to `false` tells
882-
'git-gc' never to run `git pack-refs`. The default setting is
882+
'git gc' never to run `git pack-refs`. The default setting is
883883
`notbare`. Enable it only when you know you do not have to
884884
support such clients. The default setting will change to `true`
885885
at some stage, and setting this to `false` will continue to
886-
prevent `git pack-refs` from being run from 'git-gc'.
886+
prevent `git pack-refs` from being run from 'git gc'.
887887

888888
gc.pruneexpire::
889-
When 'git-gc' is run, it will call 'prune --expire 2.weeks.ago'.
889+
When 'git gc' is run, it will call 'prune --expire 2.weeks.ago'.
890890
Override the grace period with this config variable. The value
891891
"now" may be used to disable this grace period and always prune
892892
unreachable objects immediately.
893893

894894
gc.reflogexpire::
895-
'git-reflog expire' removes reflog entries older than
895+
'git reflog expire' removes reflog entries older than
896896
this time; defaults to 90 days.
897897

898898
gc.reflogexpireunreachable::
899-
'git-reflog expire' removes reflog entries older than
899+
'git reflog expire' removes reflog entries older than
900900
this time and are not reachable from the current tip;
901901
defaults to 30 days.
902902

903903
gc.rerereresolved::
904904
Records of conflicted merge you resolved earlier are
905-
kept for this many days when 'git-rerere gc' is run.
905+
kept for this many days when 'git rerere gc' is run.
906906
The default is 60 days. See linkgit:git-rerere[1].
907907

908908
gc.rerereunresolved::
909909
Records of conflicted merge you have not resolved are
910-
kept for this many days when 'git-rerere gc' is run.
910+
kept for this many days when 'git rerere gc' is run.
911911
The default is 15 days. See linkgit:git-rerere[1].
912912

913913
gitcvs.commitmsgannotation::
@@ -1168,7 +1168,7 @@ i18n.commitEncoding::
11681168

11691169
i18n.logOutputEncoding::
11701170
Character encoding the commit messages are converted to when
1171-
running 'git-log' and friends.
1171+
running 'git log' and friends.
11721172

11731173
imap::
11741174
The configuration variables in the 'imap' section are described
@@ -1202,7 +1202,7 @@ interactive.singlekey::
12021202

12031203
log.date::
12041204
Set default date-time mode for the log command. Setting log.date
1205-
value is similar to using 'git-log'\'s --date option. The value is one of the
1205+
value is similar to using 'git log'\'s --date option. The value is one of the
12061206
following alternatives: {relative,local,default,iso,rfc,short}.
12071207
See linkgit:git-log[1].
12081208

‎Documentation/fetch-options.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ endif::git-pull[]
1919

2020
-f::
2121
--force::
22-
When 'git-fetch' is used with `<rbranch>:<lbranch>`
22+
When 'git fetch' is used with `<rbranch>:<lbranch>`
2323
refspec, it refuses to update the local branch
2424
`<lbranch>` unless the remote branch `<rbranch>` it
2525
fetches is a descendant of `<lbranch>`. This option
@@ -61,16 +61,16 @@ endif::git-pull[]
6161

6262
-u::
6363
--update-head-ok::
64-
By default 'git-fetch' refuses to update the head which
64+
By default 'git fetch' refuses to update the head which
6565
corresponds to the current branch. This flag disables the
66-
check. This is purely for the internal use for 'git-pull'
67-
to communicate with 'git-fetch', and unless you are
66+
check. This is purely for the internal use for 'git pull'
67+
to communicate with 'git fetch', and unless you are
6868
implementing your own Porcelain you are not supposed to
6969
use it.
7070

7171
--upload-pack <upload-pack>::
7272
When given, and the repository to fetch from is handled
73-
by 'git-fetch-pack', '--exec=<upload-pack>' is passed to
73+
by 'git fetch-pack', '--exec=<upload-pack>' is passed to
7474
the command to specify non-default path for the command
7575
run on the other end.
7676

‎Documentation/git-am.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ OPTIONS
3737

3838
-k::
3939
--keep::
40-
Pass `-k` flag to 'git-mailinfo' (see linkgit:git-mailinfo[1]).
40+
Pass `-k` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]).
4141

4242
-c::
4343
--scissors::
@@ -53,7 +53,7 @@ OPTIONS
5353

5454
-u::
5555
--utf8::
56-
Pass `-u` flag to 'git-mailinfo' (see linkgit:git-mailinfo[1]).
56+
Pass `-u` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]).
5757
The proposed commit log message taken from the e-mail
5858
is re-coded into UTF-8 encoding (configuration variable
5959
`i18n.commitencoding` can be used to specify project's
@@ -63,7 +63,7 @@ This was optional in prior versions of git, but now it is the
6363
default. You can use `--no-utf8` to override this.
6464

6565
--no-utf8::
66-
Pass `-n` flag to 'git-mailinfo' (see
66+
Pass `-n` flag to 'git mailinfo' (see
6767
linkgit:git-mailinfo[1]).
6868

6969
-3::
@@ -81,7 +81,7 @@ default. You can use `--no-utf8` to override this.
8181
-p<n>::
8282
--directory=<dir>::
8383
--reject::
84-
These flags are passed to the 'git-apply' (see linkgit:git-apply[1])
84+
These flags are passed to the 'git apply' (see linkgit:git-apply[1])
8585
program that applies
8686
the patch.
8787

@@ -121,7 +121,7 @@ default. You can use `--no-utf8` to override this.
121121
to the screen before exiting. This overrides the
122122
standard message informing you to use `--resolved`
123123
or `--skip` to handle the failure. This is solely
124-
for internal use between 'git-rebase' and 'git-am'.
124+
for internal use between 'git rebase' and 'git am'.
125125

126126
--abort::
127127
Restore the original branch and abort the patching operation.

‎Documentation/git-apply.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ OPTIONS
6969
without using the working tree. This implies `--index`.
7070

7171
--build-fake-ancestor=<file>::
72-
Newer 'git-diff' output has embedded 'index information'
72+
Newer 'git diff' output has embedded 'index information'
7373
for each blob to help identify the original version that
7474
the patch applies to. When this flag is given, and if
7575
the original versions of the blobs are available locally,
@@ -83,7 +83,7 @@ the information is read from the current index instead.
8383
Apply the patch in reverse.
8484

8585
--reject::
86-
For atomicity, 'git-apply' by default fails the whole patch and
86+
For atomicity, 'git apply' by default fails the whole patch and
8787
does not touch the working tree when some of the hunks
8888
do not apply. This option makes it apply
8989
the parts of the patch that are applicable, and leave the
@@ -109,7 +109,7 @@ any of those replacements occurred.
109109
ever ignored.
110110

111111
--unidiff-zero::
112-
By default, 'git-apply' expects that the patch being
112+
By default, 'git apply' expects that the patch being
113113
applied is a unified diff with at least one line of context.
114114
This provides good safety measures, but breaks down when
115115
applying a diff generated with `--unified=0`. To bypass these
@@ -120,7 +120,7 @@ discouraged.
120120

121121
--apply::
122122
If you use any of the options marked "Turns off
123-
'apply'" above, 'git-apply' reads and outputs the
123+
'apply'" above, 'git apply' reads and outputs the
124124
requested information without actually applying the
125125
patch. Give this flag after those flags to also apply
126126
the patch.
@@ -229,7 +229,7 @@ apply.whitespace::
229229

230230
Submodules
231231
----------
232-
If the patch contains any changes to submodules then 'git-apply'
232+
If the patch contains any changes to submodules then 'git apply'
233233
treats these changes as follows.
234234

235235
If `--index` is specified (explicitly or implicitly), then the submodule

‎Documentation/git-archimport.txt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@ branches that have different roots, it will refuse to run. In that case,
2929
edit your <archive/branch> parameters to define clearly the scope of the
3030
import.
3131

32-
'git-archimport' uses `tla` extensively in the background to access the
32+
'git archimport' uses `tla` extensively in the background to access the
3333
Arch repository.
3434
Make sure you have a recent version of `tla` available in the path. `tla` must
35-
know about the repositories you pass to 'git-archimport'.
35+
know about the repositories you pass to 'git archimport'.
3636

37-
For the initial import, 'git-archimport' expects to find itself in an empty
37+
For the initial import, 'git archimport' expects to find itself in an empty
3838
directory. To follow the development of a project that uses Arch, rerun
39-
'git-archimport' with the same parameters as the initial import to perform
39+
'git archimport' with the same parameters as the initial import to perform
4040
incremental imports.
4141

42-
While 'git-archimport' will try to create sensible branch names for the
42+
While 'git archimport' will try to create sensible branch names for the
4343
archives that it imports, it is also possible to specify git branch names
4444
manually. To do so, write a git branch name after each <archive/branch>
4545
parameter, separated by a colon. This way, you can shorten the Arch
@@ -84,7 +84,7 @@ OPTIONS
8484

8585
-o::
8686
Use this for compatibility with old-style branch names used by
87-
earlier versions of 'git-archimport'. Old-style branch names
87+
earlier versions of 'git archimport'. Old-style branch names
8888
were category--branch, whereas new-style branch names are
8989
archive,category--branch--version. In both cases, names given
9090
on the command-line will override the automatically-generated

‎Documentation/git-archive.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ structure for the named tree, and writes it out to the standard
2121
output. If <prefix> is specified it is
2222
prepended to the filenames in the archive.
2323

24-
'git-archive' behaves differently when given a tree ID versus when
24+
'git archive' behaves differently when given a tree ID versus when
2525
given a commit ID or tag ID. In the first case the current time is
2626
used as the modification time of each file in the archive. In the latter
2727
case the commit time as recorded in the referenced commit object is
2828
used instead. Additionally the commit ID is stored in a global
2929
extended pax header if the tar format is used; it can be extracted
30-
using 'git-get-tar-commit-id'. In ZIP files it is stored as a file
30+
using 'git get-tar-commit-id'. In ZIP files it is stored as a file
3131
comment.
3232

3333
OPTIONS

0 commit comments

Comments
 (0)