![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 27 Jan 2010 06:53:13 +0000 (22:53 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 27 Jan 2010 06:53:13 +0000 (22:53 -0800) |
* 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
Teach diff --submodule that modified submodule directory is dirty
git diff: Don't test submodule dirtiness with --ignore-submodules
Make ce_uptodate() trustworthy again
| 1 | 2 | |||
|---|---|---|---|---|
| diff-lib.c | patch | | diff1 | | diff2 | | blob | history |
| diff.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc diff-lib.c
Simple merge
diff --cc diff.c
Simple merge