Merge branch 'master' into assistant

This commit is contained in:
Joey Hess 2012-06-25 16:44:37 -04:00
commit 14015036bc
7 changed files with 28 additions and 25 deletions

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.153.14.60"
subject="comment 1"
date="2012-06-23T14:30:22Z"
content="""
The logging format could be improved, but the daemon already logs to .git/annex/daemon.log. It also automatically rotates the log file.
"""]]

View file

@ -46,7 +46,7 @@ first "/~/" or "/~user/" is expanded to the specified home directory.
This runs rsync in server mode to transfer out the content of a key.
* commit
* commit directory
This commits any staged changes to the git-annex branch.
It also runs the annex-content hook.

View file

@ -1,13 +0,0 @@
git-annex 3.20120511 released with [[!toggle text="these changes"]]
[[!toggleable text="""
* Rsync special remotes can be configured with shellescape=no
to avoid shell quoting that is normally done when using rsync over ssh.
This is known to be needed for certian rsync hosting providers
(specificially hidrive.strato.com) that use rsync over ssh but do not
pass it through the shell.
* dropunused: Allow specifying ranges to drop.
* addunused: New command, the opposite of dropunused, it relinks unused
content into the git repository.
* Fix use of several config settings: annex.ssh-options,
annex.rsync-options, annex.bup-split-options. (And adjust types to avoid
the bugs that broke several config settings.)"""]]

View file

@ -1,7 +0,0 @@
git-annex 3.20120522 released with [[!toggle text="these changes"]]
[[!toggleable text="""
* Pass -a to cp even when it supports --reflink=auto, to preserve
permissions.
* Clean up handling of git directory and git worktree.
* Add support for core.worktree, and fix support for GIT\_WORK\_TREE and
GIT\_DIR."""]]

View file

@ -0,0 +1,9 @@
git-annex 3.20120624 released with [[!toggle text="these changes"]]
[[!toggleable text="""
* watch: New subcommand, a daemon which notices changes to
files and automatically annexes new files, etc, so you don't
need to manually run git commands when manipulating files.
Available on Linux, BSDs, and OSX!
* Enable diskfree on kfreebsd, using kqueue.
* unused: Fix crash when key names contain invalid utf8.
* sync: Avoid recent git's interactive merge."""]]