diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-09-03 00:17:46 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-09-03 00:17:46 +0400 |
| commit | b9a77eeda1d7f8a56fb7aed1063956c653d137d1 (patch) | |
| tree | e1c91eac4f91e3d1d5f9853cd1f49fc335dd6008 /Documentation | |
| parent | 78c5be231bbd58f4deb6ecfabfaff1b2279a4c25 (diff) | |
| parent | b6194678b0eebdaf36d41e894b484206810f8221 (diff) | |
Merge branch 'jc/clean-exclude-doc'
* jc/clean-exclude-doc:
Documentation: clarify "git clean -e <pattern>"
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-clean.txt | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Documentation/git-clean.txt b/Documentation/git-clean.txt index 974e04ef1a..79fb984144 100644 --- a/Documentation/git-clean.txt +++ b/Documentation/git-clean.txt @@ -47,12 +47,14 @@ OPTIONS -e <pattern>:: --exclude=<pattern>:: - Specify special exceptions to not be cleaned. Each <pattern> is - the same form as in $GIT_DIR/info/excludes and this option can be - given multiple times. + 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. -x:: - Don't use the ignore rules. This allows removing all untracked + 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 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. |