]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1fee89c c3c327d)
Merge branch 'kb/status-ignored-optim-2'
authorJunio C Hamano <gitster@pobox.com>
Mon, 3 Jun 2013 19:58:56 +0000 (12:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 3 Jun 2013 19:58:56 +0000 (12:58 -0700)
Fix 1.8.3 regressions in the .gitignore path exclusion logic.

* kb/status-ignored-optim-2:
  dir.c: fix ignore processing within not-ignored directories

1  2 
dir.c patch | diff1 | diff2 | blob | history
t/t3001-ls-files-others-exclude.sh patch | diff1 | diff2 | blob | history

diff --cc dir.c
Simple merge
diff --cc t/t3001-ls-files-others-exclude.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.