summaryrefslogtreecommitdiff
path: root/Documentation/git-update-index.txt
diff options
context:
space:
mode:
authorClemens Buchacher <drizzd@aon.at>2010-05-01 09:27:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-05-08 18:12:28 (GMT)
commitac472ba65f75fbdbc52328f2bdc8645e5289e683 (patch)
treebb5c427dcb735c74fa832b2077122bac1df511ea /Documentation/git-update-index.txt
parentaecda37c66ecf215fc67b0b48998a8c69c10d5a5 (diff)
downloadgit-ac472ba65f75fbdbc52328f2bdc8645e5289e683.zip
git-ac472ba65f75fbdbc52328f2bdc8645e5289e683.tar.gz
git-ac472ba65f75fbdbc52328f2bdc8645e5289e683.tar.bz2
Documentation: git-add does not update files marked "assume unchanged"
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')
-rw-r--r--Documentation/git-update-index.txt2
1 files changed, 0 insertions, 2 deletions
diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index 68dc187..765d4b3 100644
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@ -93,8 +93,6 @@ OPTIONS
This option can be also used as a coarse file-level mechanism
to ignore uncommitted changes in tracked files (akin to what
`.gitignore` does for untracked files).
-You should remember that an explicit 'git add' operation will
-still cause the file to be refreshed from the working tree.
Git will fail (gracefully) in case it needs to modify this file
in the index e.g. when merging in a commit;
thus, in case the assumed-untracked file is changed upstream,