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

Merge branch 'duplicate'

Browse source 
Conflicts:
	debian/changelog
This commit is contained in:
Joey Hess 2013-08-20 10:27:24 -04:00
commit e240cb99f7
4 changed files with 71 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
debian/changelog vendored
View file

@ -4,6 +4,8 @@ git-annex (4.20130816) UNRELEASED; urgency=low
* Debian: Recommend ssh-askpass, which ssh will use when the assistant
is run w/o a tty. Closes: #719832
* sync, merge: Bug fix: Don't try to merge into master when in a bare repo.
* import: Add options to control handling of duplicate files:
--duplicate, --deduplicate, and --clean-duplicates
-- Joey Hess <joeyh@debian.org> Thu, 15 Aug 2013 15:47:52 +0200