| Commit message (Expand) | Author | Age |
* | increase timeout from 10 to 100 seconds | Joey Hess | 2012-07-26 |
* | when starting the assistant, wait for it to create the shim file, as well as ... | Joey Hess | 2012-07-26 |
* | webapp: check that the shim exists, and restart the assistant if not | Joey Hess | 2012-07-26 |
* | on second thought, let's use --restart rather than --force | Joey Hess | 2012-07-26 |
* | git annex webapp --force forces a restart of the daemon | Joey Hess | 2012-07-26 |
* | fix editor damage | Joey Hess | 2012-07-25 |
* | git annex webapp now opens a browser to the webapp | Joey Hess | 2012-07-25 |
* | add back debug logging | Joey Hess | 2012-07-19 |
* | Merge branch 'threaded' into assistant | Joey Hess | 2012-07-18 |
|\ |
|
| * | switch from System.Cmd.Utils to System.Process | Joey Hess | 2012-07-18 |
* | | Merge branch 'master' into assistant | Joey Hess | 2012-07-17 |
|\| |
|
| * | map: Write map.dot to .git/annex, which avoids watch trying to annex it. | Joey Hess | 2012-07-17 |
* | | Merge branch 'master' into assistant | Joey Hess | 2012-07-16 |
|\| |
|
| * | copy, drop: Avoid checking numcopies attribute unnecessarily | Joey Hess | 2012-07-10 |
* | | wrote transfer thread | Joey Hess | 2012-07-05 |
* | | Merge branch 'master' into assistant | Joey Hess | 2012-07-02 |
|\| |
|
| * | pass associatedfile and remoteuuid to git-annex-shell | Joey Hess | 2012-07-02 |
| * | record transfers for git-annex-shell | Joey Hess | 2012-07-02 |
* | | Merge branch 'master' into assistant | Joey Hess | 2012-07-01 |
|\| |
|
| * | record transfer information on local git remotes | Joey Hess | 2012-07-01 |
| * | get, move, copy: Now refuse to do anything when the requested file transfer i... | Joey Hess | 2012-07-01 |
* | | Merge branch 'master' into assistant | Joey Hess | 2012-06-27 |
|\| |
|
| * | typo | Joey Hess | 2012-06-27 |
* | | Merge branch 'master' into assistant | Joey Hess | 2012-06-27 |
|\| |
|
| * | use "variant" rather than "version" | Joey Hess | 2012-06-27 |
| * | better filenames for conflict resolution files | Joey Hess | 2012-06-27 |
| * | commit merge resolution | Joey Hess | 2012-06-27 |
| * | fix file name | Joey Hess | 2012-06-27 |
| * | don't automerge when the symlinks cannot be parsed as keys | Joey Hess | 2012-06-27 |
| * | sync: Automatically resolves merge conflicts. | Joey Hess | 2012-06-27 |
| * | properly handle deleted files when processing ls-files --unmerged | Joey Hess | 2012-06-27 |
* | | Merge branch 'master' into assistant | Joey Hess | 2012-06-23 |
|\| |
|
| * | sync: Avoid recent git's interactive merge. | Joey Hess | 2012-06-23 |
* | | the syncer now pushes out changes to remotes, in parallel | Joey Hess | 2012-06-22 |
* | | add assistant command | Joey Hess | 2012-06-22 |
|/ |
|
* | maintain set of files pendingAdd | Joey Hess | 2012-06-20 |
* | Merge branch 'master' into watch | Joey Hess | 2012-06-20 |
|\ |
|
| * | unused: Fix crash when file names contain invalid utf8. | Joey Hess | 2012-06-20 |
* | | fix kevent symlink creation | Joey Hess | 2012-06-19 |
|/ |
|
* | remove newly created tmp file before linking | Joey Hess | 2012-06-15 |
* | better temp file handling | Joey Hess | 2012-06-15 |
* | tweak | Joey Hess | 2012-06-15 |
* | Merge branch 'master' into watch | Joey Hess | 2012-06-15 |
|\ |
|
| * | addurl: Was broken by a typo introduced 2 released ago, now fixed. Closes: #6... | Joey Hess | 2012-06-14 |
* | | fishy commit | Joey Hess | 2012-06-14 |
* | | reorganize | Joey Hess | 2012-06-13 |
* | | optimise link staging at startup | Joey Hess | 2012-06-13 |
* | | plumb file status through to event handlers | Joey Hess | 2012-06-13 |
* | | move comment | Joey Hess | 2012-06-13 |
* | | tweak | Joey Hess | 2012-06-12 |