From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 27 Jan 2010 06:53:13 +0000 (-0800)
Subject: Merge branch 'jl/diff-submodule-ignore'
X-Git-Tag: v1.7.0-rc1~29
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d539de9f25920f099e4e56b0acbb4ebf246ff0f4;p=git.git

Merge branch 'jl/diff-submodule-ignore'

* jl/diff-submodule-ignore:
  Teach diff --submodule that modified submodule directory is dirty
  git diff: Don't test submodule dirtiness with --ignore-submodules
  Make ce_uptodate() trustworthy again
---

d539de9f25920f099e4e56b0acbb4ebf246ff0f4