diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-13 14:44:59 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-13 14:44:59 +0900 |
| commit | d8df70f2739af78cab6d7f9b942e890da6fbd01d (patch) | |
| tree | 516484a8bc55edcc64f5dad63626d932389d4647 /dir.h | |
| parent | 4123bcaed0897cad152c052a5fa4e499e4dafcf4 (diff) | |
| parent | 371c80c74673fd5f8fb1fb446c281e6e5be251c0 (diff) | |
| download | git-d8df70f2739af78cab6d7f9b942e890da6fbd01d.tar.gz | |
Merge branch 'jm/status-ignored-files-list'
The set of paths output from "git status --ignored" was tied
closely with its "--untracked=<mode>" option, but now it can be
controlled more flexibly. Most notably, a directory that is
ignored because it is listed to be ignored in the ignore/exclude
mechanism can be handled differently from a directory that ends up
to be ignored only because all files in it are ignored.
* jm/status-ignored-files-list:
status: test ignored modes
status: document options to show matching ignored files
status: report matching ignored and normal untracked
status: add option to show ignored files differently
Diffstat (limited to 'dir.h')
| -rw-r--r-- | dir.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -152,7 +152,8 @@ struct dir_struct { DIR_COLLECT_IGNORED = 1<<4, DIR_SHOW_IGNORED_TOO = 1<<5, DIR_COLLECT_KILLED_ONLY = 1<<6, - DIR_KEEP_UNTRACKED_CONTENTS = 1<<7 + DIR_KEEP_UNTRACKED_CONTENTS = 1<<7, + DIR_SHOW_IGNORED_TOO_MODE_MATCHING = 1<<8 } flags; struct dir_entry **entries; struct dir_entry **ignored; |