Skip to content

Commit d0e48f4

Browse files
authored
Merge pull request #910 from rpjday/git_configuration
Minor tweaks/formatting for "Git Configuration"
2 parents 31cf0c4 + 1ee753d commit d0e48f4

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

book/08-customizing-git/sections/config.asc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
=== Git Configuration
33

44
(((git commands, config)))
5-
As you briefly saw in <<_getting_started>>, you can specify Git configuration settings with the `git config` command.
5+
As you read briefly in <<_getting_started>>, you can specify Git configuration settings with the `git config` command.
66
One of the first things you did was set up your name and email address:
77

88
[source,console]
@@ -35,7 +35,7 @@ It's generally easier to run the `git config` command, though.
3535
==== Basic Client Configuration
3636

3737
The configuration options recognized by Git fall into two categories: client-side and server-side.
38-
The majority of the options are client-side configuring your personal working preferences.
38+
The majority of the options are client-side -- configuring your personal working preferences.
3939
Many, _many_ configuration options are supported, but a large fraction of them are useful only in certain edge cases; we'll cover just the most common and useful options here.
4040
If you want to see a list of all the options your version of Git recognizes, you can run
4141

@@ -70,7 +70,7 @@ For instance, consider a template file at `~/.gitmessage.txt` that looks like th
7070

7171
[source,text]
7272
----
73-
Subject line (try to keep under 60 characters)
73+
Subject line (try to keep under 50 characters)
7474
7575
Multi-line description of commit,
7676
feel free to be detailed.
@@ -393,7 +393,7 @@ This is a subtle but incredibly annoying fact of cross-platform work; many edito
393393

394394
Git can handle this by auto-converting CRLF line endings into LF when you add a file to the index, and vice versa when it checks out code onto your filesystem.
395395
You can turn on this functionality with the `core.autocrlf` setting.
396-
If you're on a Windows machine, set it to `true` this converts LF endings into CRLF when you check out code:
396+
If you're on a Windows machine, set it to `true` -- this converts LF endings into CRLF when you check out code:
397397

398398
[source,console]
399399
----
@@ -420,7 +420,7 @@ $ git config --global core.autocrlf false
420420
===== `core.whitespace`
421421

422422
Git comes preset to detect and fix some whitespace issues.
423-
It can look for six primary whitespace issues three are enabled by default and can be turned off, and three are disabled by default but can be activated.
423+
It can look for six primary whitespace issues -- three are enabled by default and can be turned off, and three are disabled by default but can be activated.
424424

425425
The three that are turned on by default are `blank-at-eol`, which looks for spaces at the end of a line; `blank-at-eof`, which notices blank lines at the end of a file; and `space-before-tab`, which looks for spaces before tabs at the beginning of a line.
426426

@@ -505,6 +505,6 @@ To avoid this, set `receive.denyDeletes` to true:
505505
$ git config --system receive.denyDeletes true
506506
----
507507

508-
This denies any deletion of branches or tags no user can do it.
508+
This denies any deletion of branches or tags -- no user can do it.
509509
To remove remote branches, you must remove the ref files from the server manually.
510510
There are also more interesting ways to do this on a per-user basis via ACLs, as you'll learn in <<_an_example_git_enforced_policy>>.

0 commit comments

Comments
 (0)