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

sync: Avoid recent git's interactive merge.

Browse source
This commit is contained in:
Joey Hess 2012-06-23 10:22:56 -04:00
parent 3118eeb63f
commit c79e3b67e9
3 changed files with 20 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
debian/changelog vendored
View file

@ -6,6 +6,7 @@ git-annex (3.20120616) UNRELEASED; urgency=low
Available on Linux, BSDs, and OSX!
* Enable diskfree on kfreebsd, using kqueue.
* unused: Fix crash when key names contain invalid utf8.
* sync: Avoid recent git's interactive merge.
-- Joey Hess <joeyh@debian.org> Tue, 12 Jun 2012 11:35:59 -0400