diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-13 11:21:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-13 11:21:11 -0700 |
| commit | 40e9b27dec28692464f43d1c213d465fed8994ba (patch) | |
| tree | db57c8cf1c828d4ac08fc0d717995869b7f6c07d /Documentation | |
| parent | 95e42a64a9e713bcc3c4590fb933c93d37342322 (diff) | |
| parent | ac472ba65f75fbdbc52328f2bdc8645e5289e683 (diff) | |
| download | git-40e9b27dec28692464f43d1c213d465fed8994ba.tar.gz | |
Merge branch 'cb/assume-unchanged-fix'
* 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.txt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt index 68dc1879fe..765d4b312e 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, |