+7 -5

Documentation/config.txt

··· 128 128 when writing commit messages. Default: true. 129 129 commitBeforeMerge:: 130 130 Advice shown when linkgit:git-merge[1] refuses to 131 131 - merge to avoid overwritting local changes. 131 131 + merge to avoid overwriting local changes. 132 132 Default: true. 133 133 resolveConflict:: 134 134 Advices shown by various commands when conflicts ··· 418 418 419 419 core.deltaBaseCacheLimit:: 420 420 Maximum number of bytes to reserve for caching base objects 421 421 - that multiple deltafied objects reference. By storing the 421 421 + that may be referenced by multiple deltified objects. By storing the 422 422 entire decompressed base objects in a cache Git is able 423 423 to avoid unpacking and decompressing frequently used base 424 424 objects multiple times. ··· 563 563 am.keepcr:: 564 564 If true, git-am will call git-mailsplit for patches in mbox format 565 565 with parameter '--keep-cr'. In this case git-mailsplit will 566 566 - not remove `\r` from lines ending with `\r\n`. Can be overrriden 566 566 + not remove `\r` from lines ending with `\r\n`. Can be overridden 567 567 by giving '--no-keep-cr' from the command line. 568 568 See linkgit:git-am[1], linkgit:git-mailsplit[1]. 569 569 ··· 1002 1002 If true, the server will look up the end-of-line conversion 1003 1003 attributes for files to determine the '-k' modes to use. If 1004 1004 the attributes force git to treat a file as text, 1005 1005 - the '-k' mode will be left blank so cvs clients will 1005 1005 + the '-k' mode will be left blank so CVS clients will 1006 1006 treat it as text. If they suppress text conversion, the file 1007 1007 will be set with '-kb' mode, which suppresses any newline munging 1008 1008 the client might otherwise do. If the attributes do not allow ··· 1275 1275 be bound to the local IP (127.0.0.1). 1276 1276 1277 1277 instaweb.modulepath:: 1278 1278 - The module path for an apache httpd used by linkgit:git-instaweb[1]. 1278 1278 + The default module path for linkgit:git-instaweb[1] to use 1279 1279 + instead of /usr/lib/apache2/modules. Only used if httpd 1280 1280 + is Apache. 1279 1281 1280 1282 instaweb.port:: 1281 1283 The port number to bind the gitweb httpd to. See

+1 -1

Documentation/git-bisect-lk2009.txt

··· 971 971 The smaller the changes in your commit, the most effective "git 972 972 bisect" will be. And you will probably need "git bisect" less in the 973 973 first place, as small changes are easier to review even if they are 974 974 - only reviewed by the commiter. 974 974 + only reviewed by the committer. 975 975 976 976 Another good idea is to have good commit messages. They can be very 977 977 helpful to understand why some changes were made.

+2 -2

Documentation/git-commit.txt

··· 130 130 Usually recording a commit that has the exact same tree as its 131 131 sole parent commit is a mistake, and the command prevents you 132 132 from making such a commit. This option bypasses the safety, and 133 133 - is primarily for use by foreign scm interface scripts. 133 133 + is primarily for use by foreign SCM interface scripts. 134 134 135 135 --allow-empty-message:: 136 136 Like --allow-empty this command is primarily for use by foreign 137 137 - scm interface scripts. It allows you to create a commit with an 137 137 + SCM interface scripts. It allows you to create a commit with an 138 138 empty commit message without using plumbing commands like 139 139 linkgit:git-commit-tree[1]. 140 140

+2 -2

Documentation/git-cvsimport.txt

··· 188 188 ------ 189 189 Problems related to timestamps: 190 190 191 191 - * If timestamps of commits in the cvs repository are not stable enough 191 191 + * If timestamps of commits in the CVS repository are not stable enough 192 192 to be used for ordering commits changes may show up in the wrong 193 193 order. 194 194 * If any files were ever "cvs import"ed more than once (e.g., import of ··· 201 201 202 202 * Branches on which no commits have been made are not imported. 203 203 * All files from the branching point are added to a branch even if 204 204 - never added in cvs. 204 204 + never added in CVS. 205 205 * This applies to files added to the source branch *after* a daughter 206 206 branch was created: if previously no commit was made on the daughter 207 207 branch they will erroneously be added to the daughter branch in git.

+2 -2

Documentation/git-cvsserver.txt

··· 366 366 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 367 367 368 368 By default the server leaves the '-k' mode blank for all files, 369 369 - which causes the cvs client to treat them as a text files, subject 370 370 - to crlf conversion on some platforms. 369 369 + which causes the CVS client to treat them as a text files, subject 370 370 + to end-of-line conversion on some platforms. 371 371 372 372 You can make the server use the end-of-line conversion attributes to 373 373 set the '-k' modes for files by setting the `gitcvs.usecrlfattr`

+1 -1

Documentation/git-hash-object.txt

··· 49 49 50 50 --no-filters:: 51 51 Hash the contents as is, ignoring any input filter that would 52 52 - have been chosen by the attributes mechanism, including crlf 52 52 + have been chosen by the attributes mechanism, including the end-of-line 53 53 conversion. If the file is read from standard input then this 54 54 is always implied, unless the --path option is given. 55 55

+1 -1

Documentation/git-reset.txt

··· 256 256 Suppose you are working on something and you commit it, and then you 257 257 continue working a bit more, but now you think that what you have in 258 258 your working tree should be in another branch that has nothing to do 259 259 - with what you commited previously. You can start a new branch and 259 259 + with what you committed previously. You can start a new branch and 260 260 reset it while keeping the changes in your work tree. 261 261 + 262 262 ------------

+1 -1

Documentation/gitrepository-layout.txt

··· 16 16 directory for a repository associated with your working tree, or 17 17 `<project>.git` directory for a public 'bare' repository. It is 18 18 also possible to have a working tree where `.git` is a plain 19 19 - ascii file containing `gitdir: <path>`, i.e. the path to the 19 19 + ASCII file containing `gitdir: <path>`, i.e. the path to the 20 20 real git repository). 21 21 22 22 objects::

+1 -1

Documentation/urls.txt

··· 25 25 - git://host.xz{startsb}:port{endsb}/~{startsb}user{endsb}/path/to/repo.git/ 26 26 - {startsb}user@{endsb}host.xz:/~{startsb}user{endsb}/path/to/repo.git/ 27 27 28 28 - For local respositories, also supported by git natively, the following 28 28 + For local repositories, also supported by git natively, the following 29 29 syntaxes may be used: 30 30 31 31 - /path/to/repo.git/