Skip to content

Commit d620daa

Browse files
committed
Merge branch 'ja/misc-doc-fixes'
Doc fixes. * ja/misc-doc-fixes: doc: fix the bnf like style of some commands doc: git-remote fix ups doc: use linkgit macro where needed. git-bisect-lk2009: make continuation of list indented
2 parents e245b4e + 9f443f5 commit d620daa

File tree

5 files changed

+21
-21
lines changed

5 files changed

+21
-21
lines changed

Documentation/git-bisect-lk2009.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ Z-Z
473473
-------------
474474

475475
2) starting from the "good" ends of the graph, associate to each
476-
commit the number of ancestors it has plus one
476+
commit the number of ancestors it has plus one
477477

478478
For example with the following graph where H is the "bad" commit and A
479479
and D are some parents of some "good" commits:
@@ -514,7 +514,7 @@ D---E
514514
-------------
515515

516516
4) the best bisection point is the commit with the highest associated
517-
number
517+
number
518518

519519
So in the above example the best bisection point is commit C.
520520

@@ -580,8 +580,8 @@ good or a bad commit does not give more or less information).
580580

581581
Let's also suppose that we have a cleaned up graph like one after step
582582
1) in the bisection algorithm above. This means that we can measure
583-
the information we get in terms of number of commit we can remove from
584-
the graph..
583+
the information we get in terms of number of commit we can remove
584+
from the graph..
585585

586586
And let's take a commit X in the graph.
587587

@@ -689,18 +689,18 @@ roughly the following steps:
689689
6) sort the commit by decreasing associated value
690690

691691
7) if the first commit has not been skipped, we can return it and stop
692-
here
692+
here
693693

694694
8) otherwise filter out all the skipped commits in the sorted list
695695

696696
9) use a pseudo random number generator (PRNG) to generate a random
697-
number between 0 and 1
697+
number between 0 and 1
698698

699699
10) multiply this random number with its square root to bias it toward
700-
0
700+
0
701701

702702
11) multiply the result by the number of commits in the filtered list
703-
to get an index into this list
703+
to get an index into this list
704704

705705
12) return the commit at the computed index
706706

Documentation/git-grep.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ providing this option will cause it to die.
209209
Use \0 as the delimiter for pathnames in the output, and print
210210
them verbatim. Without this option, pathnames with "unusual"
211211
characters are quoted as explained for the configuration
212-
variable core.quotePath (see git-config(1)).
212+
variable core.quotePath (see linkgit:git-config[1]).
213213

214214
-o::
215215
--only-matching::

Documentation/git-init.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ repository.
7070
+
7171
If this is reinitialization, the repository will be moved to the specified path.
7272

73-
-b <branch-name::
73+
-b <branch-name>::
7474
--initial-branch=<branch-name>::
7575

7676
Use the specified name for the initial branch in the newly created repository.

Documentation/git-remote.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ SYNOPSIS
1010
--------
1111
[verse]
1212
'git remote' [-v | --verbose]
13-
'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=<fetch|push>] <name> <url>
13+
'git remote add' [-t <branch>] [-m <master>] [-f] [--[no-]tags] [--mirror=(fetch|push)] <name> <url>
1414
'git remote rename' <old> <new>
1515
'git remote remove' <name>
1616
'git remote set-head' <name> (-a | --auto | -d | --delete | <branch>)
@@ -35,7 +35,7 @@ OPTIONS
3535
-v::
3636
--verbose::
3737
Be a little more verbose and show remote url after name.
38-
NOTE: This must be placed between `remote` and `subcommand`.
38+
NOTE: This must be placed between `remote` and subcommand.
3939

4040

4141
COMMANDS
@@ -46,7 +46,7 @@ subcommands are available to perform operations on the remotes.
4646

4747
'add'::
4848

49-
Adds a remote named <name> for the repository at
49+
Add a remote named <name> for the repository at
5050
<url>. The command `git fetch <name>` can then be used to create and
5151
update remote-tracking branches <name>/<branch>.
5252
+
@@ -109,13 +109,13 @@ With `-d` or `--delete`, the symbolic ref `refs/remotes/<name>/HEAD` is deleted.
109109
+
110110
With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the
111111
symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote
112-
`HEAD` is pointed at `next`, "`git remote set-head origin -a`" will set
112+
`HEAD` is pointed at `next`, `git remote set-head origin -a` will set
113113
the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will
114114
only work if `refs/remotes/origin/next` already exists; if not it must be
115115
fetched first.
116116
+
117-
Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., "git
118-
remote set-head origin master" will set the symbolic-ref `refs/remotes/origin/HEAD` to
117+
Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git
118+
remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to
119119
`refs/remotes/origin/master`. This will only work if
120120
`refs/remotes/origin/master` already exists; if not it must be fetched first.
121121
+
@@ -127,7 +127,7 @@ This can be used to track a subset of the available remote branches
127127
after the initial setup for a remote.
128128
+
129129
The named branches will be interpreted as if specified with the
130-
`-t` option on the 'git remote add' command line.
130+
`-t` option on the `git remote add` command line.
131131
+
132132
With `--add`, instead of replacing the list of currently tracked
133133
branches, adds to that list.
@@ -181,16 +181,16 @@ fetch --prune <name>`, except that no new references will be fetched.
181181
See the PRUNING section of linkgit:git-fetch[1] for what it'll prune
182182
depending on various configuration.
183183
+
184-
With `--dry-run` option, report what branches will be pruned, but do not
184+
With `--dry-run` option, report what branches would be pruned, but do not
185185
actually prune them.
186186

187187
'update'::
188188

189189
Fetch updates for remotes or remote groups in the repository as defined by
190-
remotes.<group>. If neither group nor remote is specified on the command line,
190+
`remotes.<group>`. If neither group nor remote is specified on the command line,
191191
the configuration parameter remotes.default will be used; if
192192
remotes.default is not defined, all remotes which do not have the
193-
configuration parameter remote.<name>.skipDefaultUpdate set to true will
193+
configuration parameter `remote.<name>.skipDefaultUpdate` set to true will
194194
be updated. (See linkgit:git-config[1]).
195195
+
196196
With `--prune` option, run pruning against all the remotes that are updated.

builtin/submodule--helper.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1308,7 +1308,7 @@ static int module_summary(int argc, const char **argv, const char *prefix)
13081308
};
13091309

13101310
const char *const git_submodule_helper_usage[] = {
1311-
N_("git submodule--helper summary [<options>] [commit] [--] [<path>]"),
1311+
N_("git submodule--helper summary [<options>] [<commit>] [--] [<path>]"),
13121312
NULL
13131313
};
13141314

0 commit comments

Comments
 (0)