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>maint
parent
aecda37c66
commit
ac472ba65f
|
@ -93,8 +93,6 @@ OPTIONS
|
||||||
This option can be also used as a coarse file-level mechanism
|
This option can be also used as a coarse file-level mechanism
|
||||||
to ignore uncommitted changes in tracked files (akin to what
|
to ignore uncommitted changes in tracked files (akin to what
|
||||||
`.gitignore` does for untracked files).
|
`.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
|
Git will fail (gracefully) in case it needs to modify this file
|
||||||
in the index e.g. when merging in a commit;
|
in the index e.g. when merging in a commit;
|
||||||
thus, in case the assumed-untracked file is changed upstream,
|
thus, in case the assumed-untracked file is changed upstream,
|
||||||
|
|
Loading…
Reference in New Issue