| commit | f4683b4e9cad5e0077fe0a067b15f69c828581bb | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 13 Jun 2017 20:27:01 +0000 (13 13:27 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 13 Jun 2017 20:27:02 +0000 (13 13:27 -0700) | ||
| tree | c05401c23ce9920f21e442dd4d3b8b3ed31b2037 | treesnapshot (tar.gz zip) |
| parent | f381e428b22fd65d5900f60c53fb5bc7b565d0dd | commitdiff |
| parent | 6b1db43109ab3d4c92e61874cd149779c66016db | commitdiff |
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
"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
| builtin/clean.c | diff1 | diff2 | blobhistory |
| dir.c | diff1 | diff2 | blobhistory |