Skip to content

Commit

Permalink
Merge pull request #910 from rpjday/git_configuration
Browse files Browse the repository at this point in the history
Minor tweaks/formatting for "Git Configuration"
  • Loading branch information
ben authored Oct 30, 2017
2 parents 31cf0c4 + 1ee753d commit d0e48f4
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions book/08-customizing-git/sections/config.asc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
=== Git Configuration

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

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

The configuration options recognized by Git fall into two categories: client-side and server-side.
The majority of the options are client-side configuring your personal working preferences.
The majority of the options are client-side -- configuring your personal working preferences.
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.
If you want to see a list of all the options your version of Git recognizes, you can run

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

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

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.
You can turn on this functionality with the `core.autocrlf` setting.
If you're on a Windows machine, set it to `true` this converts LF endings into CRLF when you check out code:
If you're on a Windows machine, set it to `true` -- this converts LF endings into CRLF when you check out code:

[source,console]
----
Expand All @@ -420,7 +420,7 @@ $ git config --global core.autocrlf false
===== `core.whitespace`

Git comes preset to detect and fix some whitespace issues.
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.
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.

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.

Expand Down Expand Up @@ -505,6 +505,6 @@ To avoid this, set `receive.denyDeletes` to true:
$ git config --system receive.denyDeletes true
----

This denies any deletion of branches or tags no user can do it.
This denies any deletion of branches or tags -- no user can do it.
To remove remote branches, you must remove the ref files from the server manually.
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 comments on commit d0e48f4

Please sign in to comment.