Merge branch 'nd/ignore-then-not-ignore'
authorJunio C Hamano <gitster@pobox.com>
Wed, 7 Oct 2015 20:38:17 +0000 (13:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 7 Oct 2015 20:38:17 +0000 (13:38 -0700)
commit506d8f1...394917c345965fc1762afa66678870c1
tree6ff88fa...da3500254ac3b364fbf99bb95ddb5247copy hash to clipboard (tree)
parent2b72dbb...f3a1d6c6813db2c13afaa1d0d8585f7bcopy hash to clipboard (diff)
parent57534ee...7d22e725d971ee89c77dc6aad61c573fcopy hash to clipboard (diff)
Documentation/gitignore.txt
dir.c
t/t3001-ls-files-others-exclude.sh