diff options
author | Jens Lehmann <Jens.Lehmann@web.de> | 2010-02-01 19:09:39 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-02-01 12:08:12 -0800 |
commit | 8d9e7d5293d6a8b50c9e0eb8e23ef5fed45c86d0 (patch) | |
tree | c75d2289aed0acef0ec1ce7cbcfa1651172e04f7 /Documentation/RelNotes-1.7.0.txt | |
parent | c0da5db1e692c2bc74e5cdba67baf8762ac304b4 (diff) | |
download | git-8d9e7d5293d6a8b50c9e0eb8e23ef5fed45c86d0.tar.gz |
Updates for dirty submodules in release notes and user manual
In the release notes "git status" was not mentioned, also shortly explain
the "-dirty" output generated by diff.
Added a paragraph to the "Pitfalls with submodules" section in
user-manual.txt describing new and old behavior of "git status" and "git
diff" for dirty submodules.
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/RelNotes-1.7.0.txt')
-rw-r--r-- | Documentation/RelNotes-1.7.0.txt | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Documentation/RelNotes-1.7.0.txt b/Documentation/RelNotes-1.7.0.txt index 6510d42abd..323ae54007 100644 --- a/Documentation/RelNotes-1.7.0.txt +++ b/Documentation/RelNotes-1.7.0.txt @@ -200,11 +200,13 @@ release, unless otherwise noted. from non-root dir, 2010-01-26) may be merged to older maintenance branches. - * When "git diff" is asked to compare the work tree with something, - it used to consider that a checked-out submodule with uncommitted - changes is not modified; this could cause people to forget committing - these changes in the submodule before committing in the superproject. - It now considers such a change as a modification. + * When using "git status" or asking "git diff" to compare the work tree + with something, they used to consider that a checked-out submodule with + uncommitted changes is not modified; this could cause people to forget + committing these changes in the submodule before committing in the + superproject. They now consider such a change as a modification and + "git diff" will append a "-dirty" to the work tree side when generating + patch output or when used with the --submodule option. -- exec >/var/tmp/1 |