documentation: fix apostrophe usage
Diff best viewed with --color-diff. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>maint
							parent
							
								
									384f7d17d2
								
							
						
					
					
						commit
						dbe33c5ad0
					
				|  | @ -23,7 +23,7 @@ index.threads:: | ||||||
| 	Specifies the number of threads to spawn when loading the index. | 	Specifies the number of threads to spawn when loading the index. | ||||||
| 	This is meant to reduce index load time on multiprocessor machines. | 	This is meant to reduce index load time on multiprocessor machines. | ||||||
| 	Specifying 0 or 'true' will cause Git to auto-detect the number of | 	Specifying 0 or 'true' will cause Git to auto-detect the number of | ||||||
| 	CPU's and set the number of threads accordingly. Specifying 1 or | 	CPUs and set the number of threads accordingly. Specifying 1 or | ||||||
| 	'false' will disable multithreading. Defaults to 'true'. | 	'false' will disable multithreading. Defaults to 'true'. | ||||||
|  |  | ||||||
| index.version:: | index.version:: | ||||||
|  |  | ||||||
|  | @ -74,7 +74,7 @@ pack.threads:: | ||||||
| 	warning. This is meant to reduce packing time on multiprocessor | 	warning. This is meant to reduce packing time on multiprocessor | ||||||
| 	machines. The required amount of memory for the delta search window | 	machines. The required amount of memory for the delta search window | ||||||
| 	is however multiplied by the number of threads. | 	is however multiplied by the number of threads. | ||||||
| 	Specifying 0 will cause Git to auto-detect the number of CPU's | 	Specifying 0 will cause Git to auto-detect the number of CPUs | ||||||
| 	and set the number of threads accordingly. | 	and set the number of threads accordingly. | ||||||
|  |  | ||||||
| pack.indexVersion:: | pack.indexVersion:: | ||||||
|  |  | ||||||
|  | @ -35,7 +35,7 @@ submodule.<name>.ignore:: | ||||||
| 	a submodule as modified. When set to "all", it will never be considered | 	a submodule as modified. When set to "all", it will never be considered | ||||||
| 	modified (but it will nonetheless show up in the output of status and | 	modified (but it will nonetheless show up in the output of status and | ||||||
| 	commit when it has been staged), "dirty" will ignore all changes | 	commit when it has been staged), "dirty" will ignore all changes | ||||||
| 	to the submodules work tree and | 	to the submodule's work tree and | ||||||
| 	takes only differences between the HEAD of the submodule and the commit | 	takes only differences between the HEAD of the submodule and the commit | ||||||
| 	recorded in the superproject into account. "untracked" will additionally | 	recorded in the superproject into account. "untracked" will additionally | ||||||
| 	let submodules with modified tracked files in their work tree show up. | 	let submodules with modified tracked files in their work tree show up. | ||||||
|  |  | ||||||
|  | @ -14,7 +14,7 @@ SYNOPSIS | ||||||
| DESCRIPTION | DESCRIPTION | ||||||
| ----------- | ----------- | ||||||
|  |  | ||||||
| Reads a tag contents on standard input and creates a tag object. The | Reads a tag's contents on standard input and creates a tag object. The | ||||||
| output is the new tag's <object> identifier. | output is the new tag's <object> identifier. | ||||||
|  |  | ||||||
| This command is mostly equivalent to linkgit:git-hash-object[1] | This command is mostly equivalent to linkgit:git-hash-object[1] | ||||||
|  |  | ||||||
|  | @ -163,7 +163,7 @@ will be staged (unless --cached or -n are used). | ||||||
|  |  | ||||||
| A submodule is considered up to date when the HEAD is the same as | A submodule is considered up to date when the HEAD is the same as | ||||||
| recorded in the index, no tracked files are modified and no untracked | recorded in the index, no tracked files are modified and no untracked | ||||||
| files that aren't ignored are present in the submodules work tree. | files that aren't ignored are present in the submodule's work tree. | ||||||
| Ignored files are deemed expendable and won't stop a submodule's work | Ignored files are deemed expendable and won't stop a submodule's work | ||||||
| tree from being removed. | tree from being removed. | ||||||
|  |  | ||||||
|  |  | ||||||
|  | @ -137,7 +137,7 @@ an absolute path in the remote filesystem. | ||||||
| 		    v | 		    v | ||||||
|     ssh user@example.com "git-upload-pack '/project.git'" |     ssh user@example.com "git-upload-pack '/project.git'" | ||||||
|  |  | ||||||
| In a "user@host:path" format URI, its relative to the user's home | In a "user@host:path" format URI, it's relative to the user's home | ||||||
| directory, because the Git client will run: | directory, because the Git client will run: | ||||||
|  |  | ||||||
|      git clone user@example.com:project.git |      git clone user@example.com:project.git | ||||||
|  |  | ||||||
|  | @ -71,7 +71,7 @@ refspec (or `--force`). | ||||||
| Unlike when pushing with linkgit:git-push[1], any updates outside of | Unlike when pushing with linkgit:git-push[1], any updates outside of | ||||||
| `refs/{tags,heads}/*` will be accepted without `+` in the refspec (or | `refs/{tags,heads}/*` will be accepted without `+` in the refspec (or | ||||||
| `--force`), whether that's swapping e.g. a tree object for a blob, or | `--force`), whether that's swapping e.g. a tree object for a blob, or | ||||||
| a commit for another commit that's doesn't have the previous commit as | a commit for another commit that doesn't have the previous commit as | ||||||
| an ancestor etc. | an ancestor etc. | ||||||
| + | + | ||||||
| Unlike when pushing with linkgit:git-push[1], there is no | Unlike when pushing with linkgit:git-push[1], there is no | ||||||
|  |  | ||||||
|  | @ -76,7 +76,7 @@ examples would both result in the following normalized conflict: | ||||||
| Sorting hunks | Sorting hunks | ||||||
| ~~~~~~~~~~~~~ | ~~~~~~~~~~~~~ | ||||||
|  |  | ||||||
| As before, lets imagine that a common ancestor had a file with line A | As before, let's imagine that a common ancestor had a file with line A | ||||||
| its early part, and line X in its late part.  And then four branches | its early part, and line X in its late part.  And then four branches | ||||||
| are forked that do these things: | are forked that do these things: | ||||||
|  |  | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue
	
	 Elijah Newren
						Elijah Newren