summaryrefslogtreecommitdiff
path: root/Command/Sync.hs
Commit message (Expand)AuthorAge
* more quickcheck funGravatar Joey Hess2012-12-19
* partial and incomplete automatic merging in direct modeGravatar Joey Hess2012-12-18
* direct mode merging works!Gravatar Joey Hess2012-12-18
* reorder for better displayGravatar Joey Hess2012-12-13
* direct mode committingGravatar Joey Hess2012-12-12
* also update direct mode associated files in local mergeGravatar Joey Hess2012-12-12
* direct mode mappings now updated by git annex syncGravatar Joey Hess2012-12-10
* where indentationGravatar Joey Hess2012-11-12
* git config remote.name.annex-sync can be used to control whether a remote get...Gravatar Joey Hess2012-10-11
* fix last zombies in the assistantGravatar Joey Hess2012-10-04
* sync: Pushes the git-annex branch to remote/synced/git-annex, rather than dir...Gravatar Joey Hess2012-09-16
* add decodeW8Gravatar Joey Hess2012-09-13
* refactorGravatar Joey Hess2012-08-26
* refactorGravatar Joey Hess2012-08-26
* avoid unnecessary transfer scans when syncing a disconnected remoteGravatar Joey Hess2012-08-22
* add routes to pause/start/cancel transfersGravatar Joey Hess2012-08-08
* handle case of adding populated drive to just created repoGravatar Joey Hess2012-08-05
* fix crashes when run in a git repo that has been initted but has no master br...Gravatar Joey Hess2012-08-05
* 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
|/
* sync: Show a nicer message if a user tries to sync to a special remote.Gravatar Joey Hess2012-05-27
* added ifM and nuked 11 lines of codeGravatar Joey Hess2012-03-14
* sync: Sync to lower cost remotes first.Gravatar Joey Hess2012-03-10
* improve alwayscommit=false modeGravatar Joey Hess2012-02-25
* hlintGravatar Joey Hess2012-02-16
* look up --to and --from remote names only onceGravatar Joey Hess2012-01-06
* tweakGravatar Joey Hess2012-01-02
* skip local remotes that are not available (ie, not mounted)Gravatar Joey Hess2011-12-31
* type alias cleanupGravatar Joey Hess2011-12-31
* refactor and check for a detached HEADGravatar Joey Hess2011-12-31
* better filtering out of special remotesGravatar Joey Hess2011-12-31
* never pick special remotes in --fastGravatar Joey Hess2011-12-31
* remove unnecessary checkGravatar Joey Hess2011-12-31
* refactorGravatar Joey Hess2011-12-31
* really fix check that remote needs mergedGravatar Joey Hess2011-12-31
* tweakGravatar Joey Hess2011-12-31
* tweakGravatar Joey Hess2011-12-31
* fix check that remote branch needs mergedGravatar Joey Hess2011-12-31
* minor cleanupsGravatar Joey Hess2011-12-31
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-05 03:38:27 +0000