diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-10-07 13:38:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-10-07 13:38:17 -0700 |
| commit | 506d8f1b394917c345965fc1762afa66678870c1 (patch) | |
| tree | 6ff88fa3da3500254ac3b364fbf99bb95ddb5247 /t/t6032-merge-large-rename.sh | |
| parent | 2b72dbbcf3a1d6c6813db2c13afaa1d0d8585f7b (diff) | |
| parent | 57534ee77d22e725d971ee89c77dc6aad61c573f (diff) | |
| download | git-506d8f1b394917c345965fc1762afa66678870c1.tar.gz | |
Merge branch 'nd/ignore-then-not-ignore'
Allow a later "!/abc/def" to override an earlier "/abc" that
appears in the same .gitignore file to make it easier to express
"everything in /abc directory is ignored, except for ...".
* nd/ignore-then-not-ignore:
dir.c: don't exclude whole dir prematurely if neg pattern may match
dir.c: make last_exclude_matching_from_list() run til the end
Diffstat (limited to 't/t6032-merge-large-rename.sh')
0 files changed, 0 insertions, 0 deletions