mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-24 00:47:17 +02:00
Code

Merge branch 'ab/doc-misc-typofixes' 

Typofixes.

* ab/doc-misc-typofixes:
  doc: fix typos in man pages
This commit is contained in:
Junio C Hamano 2019-04-16 19:28:08 +09:00
parent af1ec93755 ed31851fa6
commit 04116ecb7b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/git-worktree.txt
View File

@ -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.

4
Documentation/gitattributes.txt
View File

@ -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.