Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Documentation: git-add does not update files marked "assume unchanged"
author
Clemens Buchacher
<drizzd@aon.at>
Sat, 1 May 2010 09:27:20 +0000
(11:27 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Sat, 8 May 2010 18:12:28 +0000
(11:12 -0700)
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-update-index.txt
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
aecda37
)
diff --git
a/Documentation/git-update-index.txt
b/Documentation/git-update-index.txt
index 68dc1879fe912b1a01b3caa6b1c0168f6a7b8072..765d4b312ed6f062180e83fa0d931e6bd2eef24f 100644
(file)
--- 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,