summaryrefslogtreecommitdiff
path: root/Documentation/git-update-index.txt
diff options
context:
space:
mode:
authorClemens Buchacher <drizzd@aon.at>2010-05-01 09:25:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-05-01 19:00:44 (GMT)
commitaecda37c66ecf215fc67b0b48998a8c69c10d5a5 (patch)
tree407e3028610895da47c16d6c29c0cc72b1385524 /Documentation/git-update-index.txt
parente92e9cd3c388544f4f521736df844b37908c3879 (diff)
downloadgit-aecda37c66ecf215fc67b0b48998a8c69c10d5a5.zip
git-aecda37c66ecf215fc67b0b48998a8c69c10d5a5.tar.gz
git-aecda37c66ecf215fc67b0b48998a8c69c10d5a5.tar.bz2
do not overwrite files marked "assume unchanged"
A merge will fail gracefully if it needs to update files marked "assume unchanged", but other similar commands will not. In particular, checkout and rebase will silently overwrite changes to such files. This is a regression introduced in commit 1dcafcc0 (verify_uptodate(): add ce_uptodate(ce) test), which avoids lstat's during a merge, if the index entry is up-to-date. If the CE_VALID flag is set, however, we cannot trust CE_UPTODATE. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-update-index.txt')
0 files changed, 0 insertions, 0 deletions