Skip to content

Commit 319c83c

Browse files
committed
Merge pull request #317 from spacewander/patch-1
Should it be three instead of ones?
2 parents 24e8bb5 + d8a0433 commit 319c83c

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ $ git config --global core.autocrlf false
412412
Git comes preset to detect and fix some whitespace issues.
413413
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.
414414

415-
The ones 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.
415+
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.
416416

417417
The three that are disabled by default but can be turned on are `indent-with-non-tab`, which looks for lines that begin with spaces instead of tabs (and is controlled by the `tabwidth` option); `tab-in-indent`, which watches for tabs in the indentation portion of a line; and `cr-at-eol`, which tells Git that carriage returns at the end of lines are OK.
418418

0 commit comments

Comments
 (0)