From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 28 Jan 2013 19:10:25 +0000 (-0800)
Subject: Merge branch 'ap/status-ignored-in-ignored-directory' into maint
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=85fd059a89c7328ca37edd31f2d8daa4d0d61de5;p=git.git

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
---

85fd059a89c7328ca37edd31f2d8daa4d0d61de5