diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-01-16 18:42:53 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-16 16:40:56 -0800 |
| commit | 8e08b4198c40cd6d3a5d1a7e60a599adabece08e (patch) | |
| tree | bb1809acf909c66a5632185c1cddb7ac83517d45 /builtin-merge-file.c | |
| parent | Show submodules as modified when they contain a dirty work tree (diff) | |
| download | tgif-8e08b4198c40cd6d3a5d1a7e60a599adabece08e.tar.xz | |
Teach diff that modified submodule directory is dirty
A diff run in superproject only compares the name of the commit object
bound at the submodule paths. When we compare with a work tree and the
checked out submodule directory is dirty (e.g. has either staged or
unstaged changes, or has new files the user forgot to add to the index),
show the work tree side as "dirty".
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions