summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar http://joey.kitenet.net/ <joey@web>2011-03-31 19:30:30 +0000
committerGravatar admin <admin@branchable.com>2011-03-31 19:30:30 +0000
commitad2b8759dfa0fa599685b7cb26812872afe9d3a0 (patch)
treea46b442085f27f18dd7daf9ddedcede0c1bdace4
parentd512a86da9170d8c95e3aa0c6c736a77c8a32ea5 (diff)
-rw-r--r--doc/bugs/git-annex_has_issues_with_git_when_staging__47__commiting_logs.mdwn5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/bugs/git-annex_has_issues_with_git_when_staging__47__commiting_logs.mdwn b/doc/bugs/git-annex_has_issues_with_git_when_staging__47__commiting_logs.mdwn
index 774ca6a16..ed629c424 100644
--- a/doc/bugs/git-annex_has_issues_with_git_when_staging__47__commiting_logs.mdwn
+++ b/doc/bugs/git-annex_has_issues_with_git_when_staging__47__commiting_logs.mdwn
@@ -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]]