| commit | 85fd059a89c7328ca37edd31f2d8daa4d0d61de5 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 28 Jan 2013 19:10:25 +0000 (28 11:10 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 28 Jan 2013 19:10:25 +0000 (28 11:10 -0800) | ||
| tree | af771f6556d0a225b171878719f67ceb0c02031d | treesnapshot (tar.gz zip) |
| parent | 3a51e4be9c3910ce0b81de5eb1b7f4a16994fc78 | commitdiff |
| parent | a45fb697f13bb789aca930ce786cf416ef1ecd0e | commitdiff |
Merge branch 'ap/status-ignored-in-ignored-directory' into maint
Output from "git status --ignored" did not work well when used 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" did not work well when used 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 |