summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-06-05 09:03:17 +0900
committerJunio C Hamano <gitster@pobox.com>2017-06-05 09:03:17 +0900
commitb8a4652d9b96dba797a34be47c6021dad045ebcb (patch)
tree2e6205fedb2b4b262698a5c121034011722797e2
parent86799c1c616a10bfb6089f80dd0648f82b2defad (diff)
parent449456ad47e4074d6d2ee1d1d8178ab29848a137 (diff)
downloadgit-b8a4652d9b96dba797a34be47c6021dad045ebcb.tar.gz
Merge branch 'sg/core-filemode-doc-typofix' into maint
* sg/core-filemode-doc-typofix: docs/config.txt: fix indefinite article in core.fileMode description
-rw-r--r--Documentation/config.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 67f8c8fe51..3623b5014f 100644
--- 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