diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-12-22 20:27:38 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-12-22 20:27:38 (GMT) |
| commit | 14d4aab3bbd4cb25a4ccd16dc778c4c6c0a77c73 (patch) | |
| tree | eb0ff38881be06b30425a9a8f490ede7bfd53e10 /Documentation/gitignore.txt | |
| parent | 15a171f6eb436f9a31986f78bbb115ed4540ad5b (diff) | |
| parent | 936d2c9301e41a84a374b98f92777e00d321a2ea (diff) | |
| download | git-14d4aab3bbd4cb25a4ccd16dc778c4c6c0a77c73.zip git-14d4aab3bbd4cb25a4ccd16dc778c4c6c0a77c73.tar.gz git-14d4aab3bbd4cb25a4ccd16dc778c4c6c0a77c73.tar.bz2 | |
Merge branch 'po/doc-assume-unchanged'
Fixes long-standing misunderstanding of what assume-unchanged is
about. Some text near what is removed by the bottom patch may also
have to be removed.
* po/doc-assume-unchanged:
gitignore.txt: do not suggest assume-unchanged
doc: make clear --assume-unchanged's user contract
Diffstat (limited to 'Documentation/gitignore.txt')
| -rw-r--r-- | Documentation/gitignore.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt index 09e82c3..4fd0442 100644 --- a/Documentation/gitignore.txt +++ b/Documentation/gitignore.txt @@ -138,9 +138,6 @@ NOTES The purpose of gitignore files is to ensure that certain files not tracked by Git remain untracked. -To ignore uncommitted changes in a file that is already tracked, -use 'git update-index {litdd}assume-unchanged'. - To stop tracking a file that is currently tracked, use 'git rm --cached'. @@ -203,7 +200,6 @@ everything within `foo/bar`): SEE ALSO -------- linkgit:git-rm[1], -linkgit:git-update-index[1], linkgit:gitrepository-layout[5], linkgit:git-check-ignore[1] |