Browse Source

Merge branch 'dl/ignore-docs'

Doc update.

* dl/ignore-docs:
  docs: move core.excludesFile from git-add to gitignore
  git-clean.txt: clarify ignore pattern files
maint
Junio C Hamano 6 years ago
parent
commit
b582c1681e
  1. 9
      Documentation/git-add.txt
  2. 11
      Documentation/git-clean.txt
  3. 8
      Documentation/gitignore.txt

9
Documentation/git-add.txt

@ -193,15 +193,6 @@ for "git add --no-all <pathspec>...", i.e. ignored removed files. @@ -193,15 +193,6 @@ for "git add --no-all <pathspec>...", i.e. ignored removed files.
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
--------


11
Documentation/git-clean.txt

@ -55,14 +55,13 @@ OPTIONS @@ -55,14 +55,13 @@ OPTIONS

-e <pattern>::
--exclude=<pattern>::
In addition to those found in .gitignore (per directory) and
$GIT_DIR/info/exclude, also consider these patterns to be in the
set of the ignore rules in effect.
Use the given exclude pattern in addition to the standard ignore rules
(see linkgit:gitignore[5]).

-x::
Don't use the standard ignore rules read from .gitignore (per
directory) and $GIT_DIR/info/exclude, but do still use the ignore
rules given with `-e` options. This allows removing all untracked
Don't use the standard ignore rules (see linkgit:gitignore[5]), but
still use the ignore rules given with `-e` options from the command
line. This allows removing all untracked
files, including build products. This can be used (possibly in
conjunction with 'git reset') to create a pristine
working directory to test a clean build.

8
Documentation/gitignore.txt

@ -132,6 +132,14 @@ full pathname may have special meaning: @@ -132,6 +132,14 @@ full pathname may have special meaning:
- Other consecutive asterisks are considered regular asterisks and
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
-----


Loading…
Cancel
Save