@matheusbsbs / matheus-bagliano / commits / ac472ba65f
Fork 0

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>

Clemens Buchacher committed May 1, 2010 at 11:27 UTC ac472ba65f75fbdbc52328f2bdc8645e5289e683
1 file changed -2
Documentation/git-update-index.txt
-2
@@ -93,8 +93,6 @@ OPTIONS
93 This option can be also used as a coarse file-level mechanism
94 to ignore uncommitted changes in tracked files (akin to what
95 `.gitignore` does for untracked files).
96 -You should remember that an explicit 'git add' operation will
97 -still cause the file to be refreshed from the working tree.
96 Git will fail (gracefully) in case it needs to modify this file
97 in the index e.g. when merging in a commit;
98 thus, in case the assumed-untracked file is changed upstream,