diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-07-03 15:42:56 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-07-03 15:42:56 -0400 |
| commit | ac3d31034a0a2181e21d3ad599450322ed6a55dd (patch) | |
| tree | 7135de5cab66606444ab0ea2504e9ef53fbc651f /debian | |
| parent | fa45610f3809b7c0f1a469547d0c7e4209c05a9d (diff) | |
merge: Now also merges synced/master or similar branches, which makes it useful to put in a post-receive hook to make a repository automatically update its working copy when git annex sync or the assistant sync with it.
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index d708ed908..57f777758 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,10 @@ git-annex (4.20130628) UNRELEASED; urgency=low by the last run of git annex unused. Supported by fsck, get, move, copy. * get, move, copy: Can now be run in a bare repository, like fsck already could. --all is enabled automatically in this case. + * merge: Now also merges synced/master or similar branches, which + makes it useful to put in a post-receive hook to make a repository + automatically update its working copy when git annex sync or the assistant + sync with it. * webapp: Fix ssh setup with nonstandard port, broken in last release. -- Joey Hess <joeyh@debian.org> Tue, 02 Jul 2013 15:40:55 -0400 |