diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-06-13 23:27:01 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-13 23:27:02 +0300 |
| commit | f4683b4e9cad5e0077fe0a067b15f69c828581bb (patch) | |
| tree | c05401c23ce9920f21e442dd4d3b8b3ed31b2037 /Documentation | |
| parent | f381e428b22fd65d5900f60c53fb5bc7b565d0dd (diff) | |
| parent | 6b1db43109ab3d4c92e61874cd149779c66016db (diff) | |
Merge branch 'sl/clean-d-ignored-fix' into maint
"git clean -d" used to clean directories that has ignored files,
even though the command should not lose ignored ones without "-x".
"git status --ignored" did not list ignored and untracked files
without "-uall". These have been corrected.
* sl/clean-d-ignored-fix:
clean: teach clean -d to preserve ignored paths
dir: expose cmp_name() and check_contains()
dir: hide untracked contents of untracked dirs
dir: recurse into untracked dirs for ignored files
t7061: status --ignored should search untracked dirs
t7300: clean -d should skip dirs with ignored files
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/technical/api-directory-listing.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/technical/api-directory-listing.txt b/Documentation/technical/api-directory-listing.txt index 7f8e78d916..6c77b4920c 100644 --- a/Documentation/technical/api-directory-listing.txt +++ b/Documentation/technical/api-directory-listing.txt @@ -33,6 +33,12 @@ The notable options are: Similar to `DIR_SHOW_IGNORED`, but return ignored files in `ignored[]` in addition to untracked files in `entries[]`. +`DIR_KEEP_UNTRACKED_CONTENTS`::: + + Only has meaning if `DIR_SHOW_IGNORED_TOO` is also set; if this is set, the + untracked contents of untracked directories are also returned in + `entries[]`. + `DIR_COLLECT_IGNORED`::: Special mode for git-add. Return ignored files in `ignored[]` and |