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

Merge branch 'master' into bloom

Browse source 
Conflicts:
	Command/Commit.hs
	debian/changelog
This commit is contained in:
Joey Hess 2012-03-14 12:41:48 -04:00
commit 342fc28437
5 changed files with 33 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
debian/changelog vendored
View file

@ -18,6 +18,7 @@ git-annex (3.20120310) UNRELEASED; urgency=low
detect then it's too small for the number of keys in a repository.
* git-annex-shell: Runs hooks/annex-content after content is received
or dropped.
* Work around a bug in rsync (IMHO) introduced by openSUSE's SIP patch.
-- Joey Hess <joeyh@debian.org> Sat, 10 Mar 2012 14:03:22 -0400