summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-09-29 16:49:46 -0700
committerJunio C Hamano <gitster@pobox.com>2016-09-29 16:49:46 -0700
commitbf3a55a21b85c04441e67ee1fa08e5eff41ebbe8 (patch)
tree074f6b24713995042757321e8d624db237237e65
parentcec5f0bf80a972caedb72ad76dd0b0c0716bf9ff (diff)
parent7ef7903e60671bc8b13186c5ffd49c6c54435b75 (diff)
downloadgit-bf3a55a21b85c04441e67ee1fa08e5eff41ebbe8.tar.gz
Merge branch 'et/add-chmod-x' into maint
"git add --chmod=+x" added recently lacked documentation, which has been corrected. * et/add-chmod-x: add: document the chmod option
-rw-r--r--Documentation/git-add.txt7
1 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 6a96a669c2..7ed63dce0b 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -11,7 +11,7 @@ SYNOPSIS
'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]
[--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]]
[--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing]
- [--] [<pathspec>...]
+ [--chmod=(+|-)x] [--] [<pathspec>...]
DESCRIPTION
-----------
@@ -165,6 +165,11 @@ for "git add --no-all <pathspec>...", i.e. ignored removed files.
be ignored, no matter if they are already present in the work
tree or not.
+--chmod=(+|-)x::
+ Override the executable bit of the added files. The executable
+ bit is only changed in the index, the files on disk are left
+ unchanged.
+
\--::
This option can be used to separate command-line options from
the list of files, (useful when filenames might be mistaken