summaryrefslogtreecommitdiff
path: root/Command/Sync.hs
Commit message (Expand)AuthorAge
* 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
* avoid syncing remotes configured annex-ignore, unless explicitly specifiedGravatar Joey Hess2011-12-31
* sync --fast: Selects some of the remotes with the lowest annex.cost and syncs...Gravatar Joey Hess2011-12-30
* push when git-annex branch changedGravatar Joey Hess2011-12-30
* automated syncingGravatar Joey Hess2011-12-30
* automatically create the syncbranchGravatar Joey Hess2011-12-30
* refactorGravatar Joey Hess2011-12-30
* refactorGravatar Joey Hess2011-12-30
* check that synced/master exists before trying to use itGravatar Joey Hess2011-12-30
* check if branches are up-to-date before merging, pushingGravatar Joey Hess2011-12-30
* improve wordingGravatar Joey Hess2011-12-30