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:
208208* `warn` outputs warnings for a few such errors, but applies the
209209 patch as-is (default).
210210* `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
212212 used to consider only trailing whitespace characters as errors, and the
213213 fix involved 'stripping' them, but modern Gits do more).
214214* `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
219219`git diff-index --cached $M`. Note that this does not
220220necessarily match what `git diff-index --cached $H` would have
221221produced 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
223223you picked it up via e-mail in a patch form), `git diff-index
224224--cached $H` would have told you about the change before this
225225merge, 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
619619(e.g. `new-file` in "git-diff-files"), `/dev/null` (e.g. `old-file`
620620when a new file is added), or a temporary file (e.g. `old-file` in the
621621index). `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.
623623+
624624For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1
625625parameter, <path>.
Original file line number Diff line number Diff line change 3737This is even true for an originally empty line. In the following
3838examples, the end of line that ends with a whitespace letter is
3939highlighted 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
4141primarily to highlight extra whitespace at the end of some lines.
4242
4343The 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.
562562The design described here allows fetches by SHA-1 clients of a
563563personal SHA-256 repository because it's not much more difficult than
564564allowing 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
566566large number of clients would not be expected to bear that cost.
567567
568568Meaning 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:
9999 compatible with what AB and AC wanted to do.
100100
101101So 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
103103declaration.
104104
105105Imagine that similarly previously a branch XYXZ was forked from XY,
You can’t perform that action at this time.
0 commit comments