diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-09-04 18:08:47 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-09-04 18:08:47 -0400 |
| commit | 02b51c10f48e9205d2a18d58430143be6f3ae78e (patch) | |
| tree | b8dbdc4a79a300d8aa451a04831e238ead45e753 /debian | |
| parent | f77547a335232d85af462764ce90531815b1fea3 (diff) | |
| parent | 5fb17c2c28288ae2a663d2ce5ec32ff627d608b5 (diff) | |
Merge branch 'master' into encryption
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 68ba98b8b..f880fbcf7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +git-annex (4.20130828) UNRELEASED; urgency=low + + * forget: New command, causes git-annex branch history to be forgotten + in a way that will spread to other clones of the repository. + (As long as they're running this version or newer of git-annex.) + * forget --drop-dead: Completely removes mentions of repositories that + have been marked as dead from the git-annex branch. + * sync, assistant: Force push of the git-annex branch. Necessary + to ensure it gets pushed to remotes after being rewritten by forget. + * importfeed: Also ignore transient problems with downloading content + from feeds. + * Honor core.sharedrepository when receiving and adding files in direct + mode. + git-annex (4.20130827) unstable; urgency=low * Youtube support! (And 53 other video hosts). When quvi is installed, |