Skip to content

Commit

Permalink
Documentation: git-add does not update files marked "assume unchanged"
Browse files Browse the repository at this point in the history
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Clemens Buchacher authored and Junio C Hamano committed May 8, 2010
1 parent aecda37 commit ac472ba
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions Documentation/git-update-index.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit ac472ba

Please sign in to comment.