From: Clemens Buchacher Date: Sat, 1 May 2010 09:27:20 +0000 (+0200) Subject: Documentation: git-add does not update files marked "assume unchanged" X-Git-Tag: v1.7.2-rc0~83^2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ac472ba65f75fbdbc52328f2bdc8645e5289e683;p=git.git Documentation: git-add does not update files marked "assume unchanged" Signed-off-by: Clemens Buchacher Signed-off-by: Junio C Hamano --- diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt index 68dc1879f..765d4b312 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,