diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-08-20 10:27:24 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-08-20 10:27:24 -0400 |
| commit | 3254d62ee15c438d3276b73bb71895567737910e (patch) | |
| tree | d458a75e364ee26d8fe14f81455dc7fddb7a2e75 /debian | |
| parent | 546a90ac59c8ddb687e7fd8ba7f22e0022dd501a (diff) | |
| parent | 3a2dfa4044875a73c7c96275304fda8ffe4dc637 (diff) | |
Merge branch 'duplicate'
Conflicts:
debian/changelog
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 150307c22..7d1abbf67 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 |