diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-01-23 21:19:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-23 21:19:10 -0800 |
| commit | a39b15b4f6a3f08b67b17d968935d177821e680f (patch) | |
| tree | 188d8c7c1b4a4efa027516be3808db5e37b2bf13 /Documentation/gitignore.txt | |
| parent | f12e49ae877ad0644b9b9939b7cb742da98691d2 (diff) | |
| parent | 72aeb18772deeb386da7dd8997b969877bd29e41 (diff) | |
| download | git-a39b15b4f6a3f08b67b17d968935d177821e680f.tar.gz | |
Merge branch 'as/check-ignore'
Add a new command "git check-ignore" for debugging .gitignore
files.
The variable names may want to get cleaned up but that can be done
in-tree.
* as/check-ignore:
clean.c, ls-files.c: respect encapsulation of exclude_list_groups
t0008: avoid brace expansion
add git-check-ignore sub-command
setup.c: document get_pathspec()
add.c: extract new die_if_path_beyond_symlink() for reuse
add.c: extract check_path_for_gitlink() from treat_gitlinks() for reuse
pathspec.c: rename newly public functions for clarity
add.c: move pathspec matchers into new pathspec.c for reuse
add.c: remove unused argument from validate_pathspec()
dir.c: improve docs for match_pathspec() and match_pathspec_depth()
dir.c: provide clear_directory() for reclaiming dir_struct memory
dir.c: keep track of where patterns came from
dir.c: use a single struct exclude_list per source of excludes
Conflicts:
builtin/ls-files.c
dir.c
Diffstat (limited to 'Documentation/gitignore.txt')
| -rw-r--r-- | Documentation/gitignore.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt index 91a6438031..0da205fd97 100644 --- a/Documentation/gitignore.txt +++ b/Documentation/gitignore.txt @@ -184,8 +184,10 @@ The second .gitignore prevents git from ignoring SEE ALSO -------- -linkgit:git-rm[1], linkgit:git-update-index[1], -linkgit:gitrepository-layout[5] +linkgit:git-rm[1], +linkgit:git-update-index[1], +linkgit:gitrepository-layout[5], +linkgit:git-check-ignore[1] GIT --- |