summaryrefslogtreecommitdiff
path: root/builtin/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-06-02 06:06:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-06-02 06:06:05 (GMT)
commitf4fd99bf6e5c27265ee2a9ccb9c2495854f67acb (patch)
tree2fae59f74c523e7e58465b24aa343b4a90debc46 /builtin/diff.c
parentd027b467fcb526433902b024a5d30844d9346e57 (diff)
parent6b1db43109ab3d4c92e61874cd149779c66016db (diff)
downloadgit-f4fd99bf6e5c27265ee2a9ccb9c2495854f67acb.zip
git-f4fd99bf6e5c27265ee2a9ccb9c2495854f67acb.tar.gz
git-f4fd99bf6e5c27265ee2a9ccb9c2495854f67acb.tar.bz2
Merge branch 'sl/clean-d-ignored-fix'
"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 'builtin/diff.c')
0 files changed, 0 insertions, 0 deletions