| commit | 0a9a787fca09878f993ad37c71a9646277222a6b | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 14 Jan 2013 16:15:40 +0000 (14 08:15 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 14 Jan 2013 16:15:43 +0000 (14 08:15 -0800) | ||
| tree | 3d8649f52290902bd73974ea62f1cd44a192834c | treesnapshot (tar.gz zip) |
| parent | 94383a813570c254101ffd729dd8251db5fe8044 | commitdiff |
| parent | a45fb697f13bb789aca930ce786cf416ef1ecd0e | commitdiff |
Merge branch 'ap/status-ignored-in-ignored-directory'
Output from "git status --ignored" showed an unexpected interaction
with "--untracked".
* ap/status-ignored-in-ignored-directory:
status: always report ignored tracked directories
git-status: Test --ignored behavior
dir.c: Make git-status --ignored more consistent
Output from "git status --ignored" showed an unexpected interaction
with "--untracked".
* ap/status-ignored-in-ignored-directory:
status: always report ignored tracked directories
git-status: Test --ignored behavior
dir.c: Make git-status --ignored more consistent
| dir.c | diff1 | diff2 | blobhistory |
| wt-status.c | diff1 | diff2 | blobhistory |