From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 30 Jun 2011 00:03:12 +0000 (-0700)
Subject: Merge branch 'jk/maint-1.7.2-status-ignored'
X-Git-Tag: v1.7.7-rc0~122
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/50cebdade1eb97ed667543b56e5b9d4db2a921f8?hp=50cebdade1eb97ed667543b56e5b9d4db2a921f8

Merge branch 'jk/maint-1.7.2-status-ignored'

* jk/maint-1.7.2-status-ignored:
git status --ignored: tests and docs
status: fix bug with missing --ignore files

Conflicts:
Documentation/git-status.txt
t/t7508-status.sh
---