diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-09-03 14:36:00 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-09-03 14:36:00 -0400 |
| commit | 4e7315d991fb208ba77aba514ddf5f53a65f928b (patch) | |
| tree | ccc37dc5661bb66baa5192038666dccc4eade77e /debian | |
| parent | f180e741eda5ac16558e481c1e85faec647f8f07 (diff) | |
| parent | 2afb4de6c02a4515f8b1bf6e24a32cbde7eae5a8 (diff) | |
Merge branch 'forget'
Conflicts:
debian/changelog
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 59fdeff36..f880fbcf7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +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. - -- Joey Hess <joeyh@debian.org> Tue, 03 Sep 2013 14:31:45 -0400 - git-annex (4.20130827) unstable; urgency=low * Youtube support! (And 53 other video hosts). When quvi is installed, |