diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-06-29 11:42:00 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-06-29 11:42:00 -0400 |
| commit | b3aaf980e460c2287fc1ef2b262685b1879e6ed0 (patch) | |
| tree | f7f02ff6350cbf7f4470c696b5a6366c88350fa5 /doc | |
| parent | fb7663ceb86b309dd223ebc113c8b586955a0e03 (diff) | |
--force will cause add, etc, to operate on ignored files.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/bugs/git_annex_should_use___39__git_add_-f__39___internally.mdwn | 5 | ||||
| -rw-r--r-- | doc/git-annex.mdwn | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/doc/bugs/git_annex_should_use___39__git_add_-f__39___internally.mdwn b/doc/bugs/git_annex_should_use___39__git_add_-f__39___internally.mdwn index 66b3aa36a..a92f5871b 100644 --- a/doc/bugs/git_annex_should_use___39__git_add_-f__39___internally.mdwn +++ b/doc/bugs/git_annex_should_use___39__git_add_-f__39___internally.mdwn @@ -3,4 +3,9 @@ I have this line in the .gitignore file of one of my repos: So the command 'git annex init name' fails to add the file ".git-annex/uuid.log", and the same problem happens when git-annex-add'ing files. +> This is avoided on the v3 branch, which does not store these files in the +> same branch as your repository. + Also, when a file is git-ignored, it should be possible to 'git annex add' it with a -f/--force option, the same way git does it. + +> Reasonable, [[done]] --[[Joey]] diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index 12756d802..177df0952 100644 --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -314,7 +314,8 @@ Many git-annex commands will stage changes for later `git commit` by you. * --force Force unsafe actions, such as dropping a file's content when no other - source of it can be verified to still exist. Use with care. + source of it can be verified to still exist, or adding ignored files. + Use with care. * --fast |