diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-04-16 13:28:08 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-16 13:28:08 +0300 |
| commit | 04116ecb7b1cf102b7f5908bc7f4117192e82530 (patch) | |
| tree | 2832a3bcef71c64cde11f8bd5fd5101bd2326aff /Documentation | |
| parent | af1ec93755ac0b2bd71d6cf48096164b683bc881 (diff) | |
| parent | ed31851fa640a0c23a3d6ead07af5155417aeb4e (diff) | |
Merge branch 'ab/doc-misc-typofixes'
Typofixes.
* ab/doc-misc-typofixes:
doc: fix typos in man pages
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-worktree.txt | 2 | ||||
| -rw-r--r-- | Documentation/gitattributes.txt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index cb86318f3e..85d92c9761 100644 --- a/Documentation/git-worktree.txt +++ b/Documentation/git-worktree.txt @@ -213,7 +213,7 @@ refs of one working tree from another. In general, all pseudo refs are per working tree and all refs starting with "refs/" are shared. Pseudo refs are ones like HEAD which are -directly under GIT_DIR instead of inside GIT_DIR/refs. There are one +directly under GIT_DIR instead of inside GIT_DIR/refs. There is one exception to this: refs inside refs/bisect and refs/worktree is not shared. diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index fa6454f105..4fb20cd0e9 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -314,8 +314,8 @@ stored as UTF-8 internally. A client without `working-tree-encoding` support will checkout `foo.ps1` as UTF-8 encoded file. This will typically cause trouble for the users of this file. + -If a Git client, that does not support the `working-tree-encoding` -attribute, adds a new file `bar.ps1`, then `bar.ps1` will be +If a Git client that does not support the `working-tree-encoding` +attribute adds a new file `bar.ps1`, then `bar.ps1` will be stored "as-is" internally (in this example probably as UTF-16). A client with `working-tree-encoding` support will interpret the internal contents as UTF-8 and try to convert it to UTF-16 on checkout. |