summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorLibravatar Jens Lehmann <Jens.Lehmann@web.de>2010-02-01 19:09:39 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-02-01 12:08:12 -0800
commit8d9e7d5293d6a8b50c9e0eb8e23ef5fed45c86d0 (patch)
treec75d2289aed0acef0ec1ce7cbcfa1651172e04f7 /Documentation/git-merge-file.txt
parentUpdate draft release notes to 1.7.0 (diff)
downloadtgif-8d9e7d5293d6a8b50c9e0eb8e23ef5fed45c86d0.tar.xz
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/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions