Code

Merge branch 'jk/maint-1.7.2-status-ignored' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 12 Sep 2011 04:51:10 +0000 (21:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 12 Sep 2011 04:51:10 +0000 (21:51 -0700)
commit3fc44a10f62fdca29558dc553a3e12949af30637
tree988ded72a36c0e6eaf2d6cd109423f92e09fd6a1
parent30962fb7fba9a8e57fe34a70bc8abd2e0af8b2ee
parent150b493ad42757b60eacbf98ff11982456481982
Merge branch 'jk/maint-1.7.2-status-ignored' into maint

* 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
Documentation/git-status.txt
t/t7508-status.sh
wt-status.c