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

Browse source
This commit is contained in:
http://joey.kitenet.net/ 2011-03-31 19:30:30 +00:00 committed by admin
parent d512a86da9
commit ad2b8759df
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
doc/bugs/git-annex_has_issues_with_git_when_staging__47__commiting_logs.mdwn
View file

@ -27,3 +27,8 @@ For now it's just a bit of extra work for me when it does occur but it does not
>>>>> what git is doing. Sounds like the files could just not be `git
>>>>> added` yet, but I get the impression from other things that you say
>>>>> that it's not so simple. --[[Joey]]
This turns out to be a bug in git, and I have posted a bug report on the mailing list.
The git-annex behavior that causes this situation is being handled as
another bug, [[git-annex directory hashing problems on osx]].
So, closing this bug report. [[done]] --[[Joey]]