undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dl/ignore-docs'

Browse Source 
Doc update.

* dl/ignore-docs:
  docs: move core.excludesFile from git-add to gitignore
  git-clean.txt: clarify ignore pattern files
This commit is contained in:
Junio C Hamano 2019-04-10 02:14:22 +09:00
commit b582c1681e
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Documentation/git-add.txt
View File

@ -193,15 +193,6 @@ for "git add --no-all <pathspec>...", i.e. ignored removed files.
for command-line options). for command-line options).
CONFIGURATION
-------------
The optional configuration variable `core.excludesFile` indicates a path to a
file containing patterns of file names to exclude from git-add, similar to
$GIT_DIR/info/exclude. Patterns in the exclude file are used in addition to
those in info/exclude. See linkgit:gitignore[5].
EXAMPLES EXAMPLES
-------- --------

11
Documentation/git-clean.txt
View File

@ -55,14 +55,13 @@ OPTIONS
-e <pattern>:: -e <pattern>::
--exclude=<pattern>:: --exclude=<pattern>::
In addition to those found in .gitignore (per directory) and Use the given exclude pattern in addition to the standard ignore rules
$GIT_DIR/info/exclude, also consider these patterns to be in the (see linkgit:gitignore[5]).
set of the ignore rules in effect.
-x:: -x::
Don't use the standard ignore rules read from .gitignore (per Don't use the standard ignore rules (see linkgit:gitignore[5]), but
directory) and $GIT_DIR/info/exclude, but do still use the ignore still use the ignore rules given with `-e` options from the command
rules given with `-e` options. This allows removing all untracked line. This allows removing all untracked
files, including build products. This can be used (possibly in files, including build products. This can be used (possibly in
conjunction with 'git reset') to create a pristine conjunction with 'git reset') to create a pristine
working directory to test a clean build. working directory to test a clean build.

8
Documentation/gitignore.txt
View File

@ -132,6 +132,14 @@ full pathname may have special meaning:
- Other consecutive asterisks are considered regular asterisks and - Other consecutive asterisks are considered regular asterisks and
will match according to the previous rules. will match according to the previous rules.
CONFIGURATION
-------------
The optional configuration variable `core.excludesFile` indicates a path to a
file containing patterns of file names to exclude, similar to
`$GIT_DIR/info/exclude`. Patterns in the exclude file are used in addition to
those in `$GIT_DIR/info/exclude`.
NOTES NOTES
----- -----