diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-06-22 18:46:45 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-06-22 18:46:56 -0400 |
| commit | ad3770e0b203b32a07fa142d6d83c980b23310ee (patch) | |
| tree | d07022b5d9b7628701a737e3d3042680e2998770 /debian | |
| parent | 80302d0b46c5d45df1cf290796e0e27d9264ece8 (diff) | |
add merge subcommand
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index a76a0534e..03ccbe03f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ git-annex (0.20110611) UNRELEASED; urgency=low * New repository format, annex.version=3. Use `git annex upgrade` to migrate. - + * git-annex now stores its logs in a git-annex branch. + * merge: New subcommand. Auto-merges the new git-annex branch. * Improved handling of bare git repos with annexes. Many more commands will work in them. * rsync is now used when copying files from repos on other filesystems. |