diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-06-29 11:42:35 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-06-29 11:42:35 -0400 |
| commit | af45d422248846869babdbc3eae2765d94ea9f20 (patch) | |
| tree | 6f1bea8cc19dedcd8ca40c046718f7f96e7454f8 /doc/bugs | |
| parent | 5034d8c2985dafeb141bba383ab70d75729b3cb6 (diff) | |
| parent | b3aaf980e460c2287fc1ef2b262685b1879e6ed0 (diff) | |
Merge branch 'master' into v3
Conflicts:
debian/changelog
Diffstat (limited to 'doc/bugs')
| -rw-r--r-- | doc/bugs/git_annex_should_use___39__git_add_-f__39___internally.mdwn | 11 |
1 files changed, 11 insertions, 0 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 new file mode 100644 index 000000000..a92f5871b --- /dev/null +++ b/doc/bugs/git_annex_should_use___39__git_add_-f__39___internally.mdwn @@ -0,0 +1,11 @@ +I have this line in the .gitignore file of one of my repos: +*log + +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]] |