aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-21 05:39:23 -0700
committerJunio C Hamano <gitster@pobox.com>2010-06-21 05:39:23 -0700
commit443f26cbcac66368eb0ec8a8a250bf5815ad0a10 (patch)
tree0363e0e85d5009e9e042b4d22410c6d95373d805 /Documentation
parent1b9fa0e81134df5c067efc1e3413f05c9e5043f8 (diff)
parentac472ba65f75fbdbc52328f2bdc8645e5289e683 (diff)
downloadgit-443f26cbcac66368eb0ec8a8a250bf5815ad0a10.tar.gz
git-443f26cbcac66368eb0ec8a8a250bf5815ad0a10.tar.xz
Merge branch 'cb/assume-unchanged-fix' into maint
* cb/assume-unchanged-fix: Documentation: git-add does not update files marked "assume unchanged" do not overwrite files marked "assume unchanged"
Diffstat (limited to 'Documentation')
-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 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,