Merge branch 'jn/gitweb-unspecified-action' into maint-1.7.8

[git.git] / Documentation / git-clean.txt

diff --git a/Documentation/git-clean.txt b/Documentation/git-clean.txt
index a81cb6c28050e83778f11f2957d3489f50fa6004..79fb9841441d02cd635dcdd2aecef42d38c6b59d 100644 (file)
--- a/Documentation/git-clean.txt
+++ b/Documentation/git-clean.txt
@@ -8,7 +8,7 @@ git-clean - Remove untracked files from the working tree
 SYNOPSIS
 --------
 [verse]
 SYNOPSIS
 --------
 [verse]

-'git clean' [-d] [-f] [-n] [-q] [-x | -X] [--] <path>...
+'git clean' [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <path>...

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------


@@ -45,8 +45,16 @@ OPTIONS
        Be quiet, only report errors, but not the files that are
        successfully removed.
 
        Be quiet, only report errors, but not the files that are
        successfully removed.
 

+-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.
+

 -x::
 -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.
        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.


@@ -55,12 +63,6 @@ OPTIONS
        Remove only files ignored by git.  This may be useful to rebuild
        everything from scratch, but keep manually created files.
 
        Remove only files ignored by git.  This may be useful to rebuild
        everything from scratch, but keep manually created files.
 

-
-Author
-------
-Written by Pavel Roskin <proski@gnu.org>
-
-

 GIT
 ---
 Part of the linkgit:git[1] suite
 GIT
 ---
 Part of the linkgit:git[1] suite