diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-06-09 17:05:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-09 17:05:15 -0700 |
| commit | fd500302096b5b4e45d78c14d6ea9a704f556a16 (patch) | |
| tree | 8b4d7091d3e78f597d0845711a7401986e912982 /t/t7607-merge-overwrite.sh | |
| parent | submodule: remove redundant check for the_index.initialized (diff) | |
| parent | dir.c: fix ignore processing within not-ignored directories (diff) | |
| download | tgif-fd500302096b5b4e45d78c14d6ea9a704f556a16.tar.xz | |
Merge branch 'kb/status-ignored-optim-2' into maint
Fix recent regression of .gitignore files that list !directory to
mark it not-ignored.
* kb/status-ignored-optim-2:
dir.c: fix ignore processing within not-ignored directories
Diffstat (limited to 't/t7607-merge-overwrite.sh')
0 files changed, 0 insertions, 0 deletions