Merge branch 'sg/core-filemode-doc-typofix' into maint

gitster · gitster · commit b8a4652d9b96 · 2017-06-05T09:03:17.000+09:00
* sg/core-filemode-doc-typofix:
  docs/config.txt: fix indefinite article in core.fileMode description
diff --git a/Documentation/config.txt b/Documentation/config.txt
@@ -345,7 +345,7 @@ core.fileMode::
 	is to be honored.
 +
 Some filesystems lose the executable bit when a file that is
-marked as executable is checked out, or checks out an
+marked as executable is checked out, or checks out a
 non-executable file with executable bit on.
 linkgit:git-clone[1] or linkgit:git-init[1] probe the filesystem
 to see if it handles the executable bit correctly

Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,7 @@ core.fileMode::`
`345`	`345`	`is to be honored.`
`346`	`346`	`+`
`347`	`347`	`Some filesystems lose the executable bit when a file that is`
`348`		`-marked as executable is checked out, or checks out an`
	`348`	`+marked as executable is checked out, or checks out a`
`349`	`349`	`non-executable file with executable bit on.`
`350`	`350`	`linkgit:git-clone[1] or linkgit:git-init[1] probe the filesystem`
`351`	`351`	`to see if it handles the executable bit correctly`