File tree Expand file tree Collapse file tree 6 files changed +6
-6
lines changed Expand file tree Collapse file tree 6 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -208,7 +208,7 @@ behavior:
208
208
* `warn` outputs warnings for a few such errors, but applies the
209
209
patch as-is (default).
210
210
* `fix` outputs warnings for a few such errors, and applies the
211
- patch after fixing them (`strip` is a synonym --- the tool
211
+ patch after fixing them (`strip` is a synonym -- the tool
212
212
used to consider only trailing whitespace characters as errors, and the
213
213
fix involved 'stripping' them, but modern Gits do more).
214
214
* `error` outputs warnings for a few such errors, and refuses
Original file line number Diff line number Diff line change @@ -219,7 +219,7 @@ see which of the "local changes" that you made were carried forward by running
219
219
`git diff-index --cached $M`. Note that this does not
220
220
necessarily match what `git diff-index --cached $H` would have
221
221
produced before such a two tree merge. This is because of cases
222
- 18 and 19 --- if you already had the changes in $M (e.g. maybe
222
+ 18 and 19 -- if you already had the changes in $M (e.g. maybe
223
223
you picked it up via e-mail in a patch form), `git diff-index
224
224
--cached $H` would have told you about the change before this
225
225
merge, but it would not show in `git diff-index --cached $M`
Original file line number Diff line number Diff line change @@ -619,7 +619,7 @@ The file parameters can point at the user's working file
619
619
(e.g. `new-file` in "git-diff-files"), `/dev/null` (e.g. `old-file`
620
620
when a new file is added), or a temporary file (e.g. `old-file` in the
621
621
index). `GIT_EXTERNAL_DIFF` should not worry about unlinking the
622
- temporary file --- it is removed when `GIT_EXTERNAL_DIFF` exits.
622
+ temporary file -- it is removed when `GIT_EXTERNAL_DIFF` exits.
623
623
+
624
624
For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1
625
625
parameter, <path>.
Original file line number Diff line number Diff line change 37
37
This is even true for an originally empty line. In the following
38
38
examples, the end of line that ends with a whitespace letter is
39
39
highlighted with a `$` sign; if you are trying to recreate these
40
- example by hand, do not cut and paste them--- they are there
40
+ example by hand, do not cut and paste them--they are there
41
41
primarily to highlight extra whitespace at the end of some lines.
42
42
43
43
The signed payload and the way the signature is embedded depends
Original file line number Diff line number Diff line change @@ -562,7 +562,7 @@ hash re-encode during clone and to encourage peers to modernize.
562
562
The design described here allows fetches by SHA-1 clients of a
563
563
personal SHA-256 repository because it's not much more difficult than
564
564
allowing pushes from that repository. This support needs to be guarded
565
- by a configuration option --- servers like git.kernel.org that serve a
565
+ by a configuration option -- servers like git.kernel.org that serve a
566
566
large number of clients would not be expected to bear that cost.
567
567
568
568
Meaning of signatures
Original file line number Diff line number Diff line change @@ -99,7 +99,7 @@ conflict to leave line D means that the user declares:
99
99
compatible with what AB and AC wanted to do.
100
100
101
101
So the conflict we would see when merging AB into ACAB should be
102
- resolved the same way--- it is the resolution that is in line with that
102
+ resolved the same way--it is the resolution that is in line with that
103
103
declaration.
104
104
105
105
Imagine that similarly previously a branch XYXZ was forked from XY,
You can’t perform that action at this time.
0 commit comments