mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' into v3

Browse source 
Conflicts:
	debian/changelog
This commit is contained in:
Joey Hess 2011-06-29 11:42:35 -04:00
commit af45d42224
6 changed files with 29 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
doc/bugs/git_annex_should_use___39__git_add_-f__39___internally.mdwn Normal file
View file

@ -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]]