Skip to content

Commit bc1e048

Browse files
committed
Merge branch 'jc/em-dash-in-doc' into maint
AsciiDoc markup fixes. * jc/em-dash-in-doc: Documentation: AsciiDoc spells em-dash as double-dashes, not triple
2 parents d091031 + 3b19dba commit bc1e048

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

Documentation/RelNotes/1.7.7.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Updates since v1.7.6
8484
logic used by "git diff" to determine the hunk header.
8585

8686
* Invoking the low-level "git http-fetch" without "-a" option (which
87-
git itself never did---normal users should not have to worry about
87+
git itself never did--normal users should not have to worry about
8888
this) is now deprecated.
8989

9090
* The "--decorate" option to "git log" and its family learned to

Documentation/RelNotes/1.9.0.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ Performance, Internal Implementation, etc.
177177
* The naming convention of the packfiles has been updated; it used to
178178
be based on the enumeration of names of the objects that are
179179
contained in the pack, but now it also depends on how the packed
180-
result is represented---packing the same set of objects using
180+
result is represented--packing the same set of objects using
181181
different settings (or delta order) would produce a pack with
182182
different name.
183183

Documentation/git-bisect.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ cannot be tested. If the script exits with this code, the current
253253
revision will be skipped (see `git bisect skip` above). 125 was chosen
254254
as the highest sensible value to use for this purpose, because 126 and 127
255255
are used by POSIX shells to signal specific error status (127 is for
256-
command not found, 126 is for command found but not executable---these
256+
command not found, 126 is for command found but not executable--these
257257
details do not matter, as they are normal errors in the script, as far as
258258
`bisect run` is concerned).
259259

Documentation/git-fetch.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ This configuration is used in two ways:
7171
* When `git fetch` is run without specifying what branches
7272
and/or tags to fetch on the command line, e.g. `git fetch origin`
7373
or `git fetch`, `remote.<repository>.fetch` values are used as
74-
the refspecs---they specify which refs to fetch and which local refs
74+
the refspecs--they specify which refs to fetch and which local refs
7575
to update. The example above will fetch
7676
all branches that exist in the `origin` (i.e. any ref that matches
7777
the left-hand side of the value, `refs/heads/*`) and update the

Documentation/git-push.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ be named.
6262
If `git push [<repository>]` without any `<refspec>` argument is set to
6363
update some ref at the destination with `<src>` with
6464
`remote.<repository>.push` configuration variable, `:<dst>` part can
65-
be omitted---such a push will update a ref that `<src>` normally updates
65+
be omitted--such a push will update a ref that `<src>` normally updates
6666
without any `<refspec>` on the command line. Otherwise, missing
6767
`:<dst>` means to update the same ref as the `<src>`.
6868
+

Documentation/technical/index-format.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ Git index format
170170

171171
The entries are written out in the top-down, depth-first order. The
172172
first entry represents the root level of the repository, followed by the
173-
first subtree---let's call this A---of the root level (with its name
173+
first subtree--let's call this A--of the root level (with its name
174174
relative to the root level), followed by the first subtree of A (with
175175
its name relative to A), ...
176176

0 commit comments

Comments
 (0)