Documentation: spelling fixes
[jc: with wording changes from Jonathan Nieder] Signed-off-by: Junio C Hamano <gitster@pobox.com>maint
							parent
							
								
									77b5be2aba
								
							
						
					
					
						commit
						6b677a28ff
					
				|  | @ -128,7 +128,7 @@ advice.*:: | ||||||
| 		when writing commit messages. Default: true. | 		when writing commit messages. Default: true. | ||||||
| 	commitBeforeMerge:: | 	commitBeforeMerge:: | ||||||
| 		Advice shown when linkgit:git-merge[1] refuses to | 		Advice shown when linkgit:git-merge[1] refuses to | ||||||
| 		merge to avoid overwritting local changes. | 		merge to avoid overwriting local changes. | ||||||
| 		Default: true. | 		Default: true. | ||||||
| 	resolveConflict:: | 	resolveConflict:: | ||||||
| 		Advices shown by various commands when conflicts | 		Advices shown by various commands when conflicts | ||||||
|  | @ -418,7 +418,7 @@ Common unit suffixes of 'k', 'm', or 'g' are supported. | ||||||
|  |  | ||||||
| core.deltaBaseCacheLimit:: | core.deltaBaseCacheLimit:: | ||||||
| 	Maximum number of bytes to reserve for caching base objects | 	Maximum number of bytes to reserve for caching base objects | ||||||
| 	that multiple deltafied objects reference.  By storing the | 	that may be referenced by multiple deltified objects.  By storing the | ||||||
| 	entire decompressed base objects in a cache Git is able | 	entire decompressed base objects in a cache Git is able | ||||||
| 	to avoid unpacking and decompressing frequently used base | 	to avoid unpacking and decompressing frequently used base | ||||||
| 	objects multiple times. | 	objects multiple times. | ||||||
|  | @ -563,7 +563,7 @@ not necessarily be the current directory. | ||||||
| am.keepcr:: | am.keepcr:: | ||||||
| 	If true, git-am will call git-mailsplit for patches in mbox format | 	If true, git-am will call git-mailsplit for patches in mbox format | ||||||
| 	with parameter '--keep-cr'. In this case git-mailsplit will | 	with parameter '--keep-cr'. In this case git-mailsplit will | ||||||
| 	not remove `\r` from lines ending with `\r\n`. Can be overrriden | 	not remove `\r` from lines ending with `\r\n`. Can be overridden | ||||||
| 	by giving '--no-keep-cr' from the command line. | 	by giving '--no-keep-cr' from the command line. | ||||||
| 	See linkgit:git-am[1], linkgit:git-mailsplit[1]. | 	See linkgit:git-am[1], linkgit:git-mailsplit[1]. | ||||||
|  |  | ||||||
|  | @ -1002,7 +1002,7 @@ gitcvs.usecrlfattr:: | ||||||
| 	If true, the server will look up the end-of-line conversion | 	If true, the server will look up the end-of-line conversion | ||||||
| 	attributes for files to determine the '-k' modes to use. If | 	attributes for files to determine the '-k' modes to use. If | ||||||
| 	the attributes force git to treat a file as text, | 	the attributes force git to treat a file as text, | ||||||
| 	the '-k' mode will be left blank so cvs clients will | 	the '-k' mode will be left blank so CVS clients will | ||||||
| 	treat it as text. If they suppress text conversion, the file | 	treat it as text. If they suppress text conversion, the file | ||||||
| 	will be set with '-kb' mode, which suppresses any newline munging | 	will be set with '-kb' mode, which suppresses any newline munging | ||||||
| 	the client might otherwise do. If the attributes do not allow | 	the client might otherwise do. If the attributes do not allow | ||||||
|  | @ -1275,7 +1275,9 @@ instaweb.local:: | ||||||
| 	be bound to the local IP (127.0.0.1). | 	be bound to the local IP (127.0.0.1). | ||||||
|  |  | ||||||
| instaweb.modulepath:: | instaweb.modulepath:: | ||||||
| 	The module path for an apache httpd used by linkgit:git-instaweb[1]. | 	The default module path for linkgit:git-instaweb[1] to use | ||||||
|  | 	instead of /usr/lib/apache2/modules.  Only used if httpd | ||||||
|  | 	is Apache. | ||||||
|  |  | ||||||
| instaweb.port:: | instaweb.port:: | ||||||
| 	The port number to bind the gitweb httpd to. See | 	The port number to bind the gitweb httpd to. See | ||||||
|  |  | ||||||
|  | @ -971,7 +971,7 @@ logical change in each commit. | ||||||
| The smaller the changes in your commit, the most effective "git | The smaller the changes in your commit, the most effective "git | ||||||
| bisect" will be. And you will probably need "git bisect" less in the | bisect" will be. And you will probably need "git bisect" less in the | ||||||
| first place, as small changes are easier to review even if they are | first place, as small changes are easier to review even if they are | ||||||
| only reviewed by the commiter. | only reviewed by the committer. | ||||||
|  |  | ||||||
| Another good idea is to have good commit messages. They can be very | Another good idea is to have good commit messages. They can be very | ||||||
| helpful to understand why some changes were made. | helpful to understand why some changes were made. | ||||||
|  |  | ||||||
|  | @ -130,11 +130,11 @@ OPTIONS | ||||||
| 	Usually recording a commit that has the exact same tree as its | 	Usually recording a commit that has the exact same tree as its | ||||||
| 	sole parent commit is a mistake, and the command prevents you | 	sole parent commit is a mistake, and the command prevents you | ||||||
| 	from making such a commit.  This option bypasses the safety, and | 	from making such a commit.  This option bypasses the safety, and | ||||||
| 	is primarily for use by foreign scm interface scripts. | 	is primarily for use by foreign SCM interface scripts. | ||||||
|  |  | ||||||
| --allow-empty-message:: | --allow-empty-message:: | ||||||
|        Like --allow-empty this command is primarily for use by foreign |        Like --allow-empty this command is primarily for use by foreign | ||||||
|        scm interface scripts. It allows you to create a commit with an |        SCM interface scripts. It allows you to create a commit with an | ||||||
|        empty commit message without using plumbing commands like |        empty commit message without using plumbing commands like | ||||||
|        linkgit:git-commit-tree[1]. |        linkgit:git-commit-tree[1]. | ||||||
|  |  | ||||||
|  |  | ||||||
|  | @ -188,7 +188,7 @@ ISSUES | ||||||
| ------ | ------ | ||||||
| Problems related to timestamps: | Problems related to timestamps: | ||||||
|  |  | ||||||
|  * If timestamps of commits in the cvs repository are not stable enough |  * If timestamps of commits in the CVS repository are not stable enough | ||||||
|    to be used for ordering commits changes may show up in the wrong |    to be used for ordering commits changes may show up in the wrong | ||||||
|    order. |    order. | ||||||
|  * If any files were ever "cvs import"ed more than once (e.g., import of |  * If any files were ever "cvs import"ed more than once (e.g., import of | ||||||
|  | @ -201,7 +201,7 @@ Problems related to branches: | ||||||
|  |  | ||||||
|  * Branches on which no commits have been made are not imported. |  * Branches on which no commits have been made are not imported. | ||||||
|  * All files from the branching point are added to a branch even if |  * All files from the branching point are added to a branch even if | ||||||
|    never added in cvs. |    never added in CVS. | ||||||
|  * This applies to files added to the source branch *after* a daughter |  * This applies to files added to the source branch *after* a daughter | ||||||
|    branch was created: if previously no commit was made on the daughter |    branch was created: if previously no commit was made on the daughter | ||||||
|    branch they will erroneously be added to the daughter branch in git. |    branch they will erroneously be added to the daughter branch in git. | ||||||
|  |  | ||||||
|  | @ -366,8 +366,8 @@ CRLF Line Ending Conversions | ||||||
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||||||
|  |  | ||||||
| By default the server leaves the '-k' mode blank for all files, | By default the server leaves the '-k' mode blank for all files, | ||||||
| which causes the cvs client to treat them as a text files, subject | which causes the CVS client to treat them as a text files, subject | ||||||
| to crlf conversion on some platforms. | to end-of-line conversion on some platforms. | ||||||
|  |  | ||||||
| You can make the server use the end-of-line conversion attributes to | You can make the server use the end-of-line conversion attributes to | ||||||
| set the '-k' modes for files by setting the `gitcvs.usecrlfattr` | set the '-k' modes for files by setting the `gitcvs.usecrlfattr` | ||||||
|  |  | ||||||
|  | @ -49,7 +49,7 @@ OPTIONS | ||||||
|  |  | ||||||
| --no-filters:: | --no-filters:: | ||||||
| 	Hash the contents as is, ignoring any input filter that would | 	Hash the contents as is, ignoring any input filter that would | ||||||
| 	have been chosen by the attributes mechanism, including crlf | 	have been chosen by the attributes mechanism, including the end-of-line | ||||||
| 	conversion. If the file is read from standard input then this | 	conversion. If the file is read from standard input then this | ||||||
| 	is always implied, unless the --path option is given. | 	is always implied, unless the --path option is given. | ||||||
|  |  | ||||||
|  |  | ||||||
|  | @ -355,7 +355,7 @@ Keep changes in working tree while discarding some previous commits:: | ||||||
| Suppose you are working on something and you commit it, and then you | Suppose you are working on something and you commit it, and then you | ||||||
| continue working a bit more, but now you think that what you have in | continue working a bit more, but now you think that what you have in | ||||||
| your working tree should be in another branch that has nothing to do | your working tree should be in another branch that has nothing to do | ||||||
| with what you commited previously. You can start a new branch and | with what you committed previously. You can start a new branch and | ||||||
| reset it while keeping the changes in your work tree. | reset it while keeping the changes in your work tree. | ||||||
| + | + | ||||||
| ------------ | ------------ | ||||||
|  |  | ||||||
|  | @ -16,7 +16,7 @@ You may find these things in your git repository (`.git` | ||||||
| directory for a repository associated with your working tree, or | directory for a repository associated with your working tree, or | ||||||
| `<project>.git` directory for a public 'bare' repository. It is | `<project>.git` directory for a public 'bare' repository. It is | ||||||
| also possible to have a working tree where `.git` is a plain | also possible to have a working tree where `.git` is a plain | ||||||
| ascii file containing `gitdir: <path>`, i.e. the path to the | ASCII file containing `gitdir: <path>`, i.e. the path to the | ||||||
| real git repository). | real git repository). | ||||||
|  |  | ||||||
| objects:: | objects:: | ||||||
|  |  | ||||||
|  | @ -25,7 +25,7 @@ The ssh and git protocols additionally support ~username expansion: | ||||||
| - git://host.xz{startsb}:port{endsb}/~{startsb}user{endsb}/path/to/repo.git/ | - git://host.xz{startsb}:port{endsb}/~{startsb}user{endsb}/path/to/repo.git/ | ||||||
| - {startsb}user@{endsb}host.xz:/~{startsb}user{endsb}/path/to/repo.git/ | - {startsb}user@{endsb}host.xz:/~{startsb}user{endsb}/path/to/repo.git/ | ||||||
|  |  | ||||||
| For local respositories, also supported by git natively, the following | For local repositories, also supported by git natively, the following | ||||||
| syntaxes may be used: | syntaxes may be used: | ||||||
|  |  | ||||||
| - /path/to/repo.git/ | - /path/to/repo.git/ | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue
	
	 Ville Skyttä
						Ville Skyttä