summaryrefslogtreecommitdiff
path: root/Command
Commit message (Expand)AuthorAge
* Merge branch 'master' into assistantGravatar Joey Hess2012-07-27
|\
| * initremote: Avoid recording remote's description before checking that its con...Gravatar Joey Hess2012-07-27
* | now the webapp has the same options as the assistantGravatar Joey Hess2012-07-27
* | much better webapp startup of the assistantGravatar Joey Hess2012-07-27
* | increase timeout from 10 to 100 secondsGravatar Joey Hess2012-07-26
* | when starting the assistant, wait for it to create the shim file, as well as ...Gravatar Joey Hess2012-07-26
* | webapp: check that the shim exists, and restart the assistant if notGravatar Joey Hess2012-07-26
* | on second thought, let's use --restart rather than --forceGravatar Joey Hess2012-07-26
* | git annex webapp --force forces a restart of the daemonGravatar Joey Hess2012-07-26
* | fix editor damageGravatar Joey Hess2012-07-25
* | git annex webapp now opens a browser to the webappGravatar Joey Hess2012-07-25
* | add back debug loggingGravatar Joey Hess2012-07-19
| * pull in transfer log code from assistant branchGravatar Joey Hess2012-07-18
* | Merge branch 'threaded' into assistantGravatar Joey Hess2012-07-18
|\ \
| * | switch from System.Cmd.Utils to System.ProcessGravatar Joey Hess2012-07-18
| |/
* | Merge branch 'master' into assistantGravatar Joey Hess2012-07-17
|\|
| * map: Write map.dot to .git/annex, which avoids watch trying to annex it.Gravatar Joey Hess2012-07-17
* | Merge branch 'master' into assistantGravatar Joey Hess2012-07-16
|\|
| * copy, drop: Avoid checking numcopies attribute unnecessarilyGravatar Joey Hess2012-07-10
* | wrote transfer threadGravatar Joey Hess2012-07-05
* | Merge branch 'master' into assistantGravatar Joey Hess2012-07-02
|\|
| * pass associatedfile and remoteuuid to git-annex-shellGravatar Joey Hess2012-07-02
| * record transfers for git-annex-shellGravatar Joey Hess2012-07-02
* | Merge branch 'master' into assistantGravatar Joey Hess2012-07-01
|\|
| * record transfer information on local git remotesGravatar Joey Hess2012-07-01
| * get, move, copy: Now refuse to do anything when the requested file transfer i...Gravatar Joey Hess2012-07-01
* | Merge branch 'master' into assistantGravatar Joey Hess2012-06-27
|\|
| * typoGravatar Joey Hess2012-06-27
* | Merge branch 'master' into assistantGravatar Joey Hess2012-06-27
|\|
| * use "variant" rather than "version"Gravatar Joey Hess2012-06-27
| * better filenames for conflict resolution filesGravatar Joey Hess2012-06-27
| * commit merge resolutionGravatar Joey Hess2012-06-27
| * fix file nameGravatar Joey Hess2012-06-27
| * don't automerge when the symlinks cannot be parsed as keysGravatar Joey Hess2012-06-27
| * sync: Automatically resolves merge conflicts.Gravatar Joey Hess2012-06-27
| * properly handle deleted files when processing ls-files --unmergedGravatar Joey Hess2012-06-27
* | Merge branch 'master' into assistantGravatar Joey Hess2012-06-23
|\|
| * sync: Avoid recent git's interactive merge.Gravatar Joey Hess2012-06-23
* | the syncer now pushes out changes to remotes, in parallelGravatar Joey Hess2012-06-22
* | add assistant commandGravatar Joey Hess2012-06-22
|/
* maintain set of files pendingAddGravatar Joey Hess2012-06-20
* Merge branch 'master' into watchGravatar Joey Hess2012-06-20
|\
| * unused: Fix crash when file names contain invalid utf8.Gravatar Joey Hess2012-06-20
* | fix kevent symlink creationGravatar Joey Hess2012-06-19
|/
* remove newly created tmp file before linkingGravatar Joey Hess2012-06-15
* better temp file handlingGravatar Joey Hess2012-06-15
* tweakGravatar Joey Hess2012-06-15
* Merge branch 'master' into watchGravatar Joey Hess2012-06-15
|\
| * addurl: Was broken by a typo introduced 2 released ago, now fixed. Closes: #6...Gravatar Joey Hess2012-06-14
* | fishy commitGravatar Joey Hess2012-06-14
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-15 06:35:14 +0000