Merge branch 'master' into desymlink

Conflicts:
	debian/changelog
	doc/design/assistant/desymlink.mdwn
This commit is contained in:
Joey Hess 2012-12-17 13:29:10 -04:00
commit 40fa6936e4
52 changed files with 675 additions and 42 deletions

1
debian/changelog vendored
View file

@ -5,6 +5,7 @@ git-annex (3.20121212) UNRELEASED; urgency=low
via symlinks. Note that direct mode is currently experimental. Many
git and git-annex commands do not work, or can even cause data loss in
direct mode.
* kqueue: Fix bug that made broken symlinks not be noticed.
-- Joey Hess <joeyh@debian.org> Thu, 13 Dec 2012 14:06:43 -0400