summaryrefslogtreecommitdiff
path: root/Assistant/Threads/Merger.hs
Commit message (Expand)AuthorAge
* refactor getCurrentBranchJoey Hess2018-10-19
* assistant: update export db after mergeing git-annex branch changesJoey Hess2017-09-20
* assistant: Merge changes from refs/remotes/foo/master into master.Joey Hess2017-06-07
* analysisJoey Hess2017-06-07
* configuration to disable automatic merge conflict resolutionJoey Hess2017-06-01
* clean up some importsJoey Hess2016-12-27
* Merge branch 'master' into no-xmppJoey Hess2016-12-24
|\
| * sync: Pass --allow-unrelated-histories to git merge when used with git git 2....Joey Hess2016-11-15
* | remove xmpp supportJoey Hess2016-11-14
|/
* move keys db closure to AutoMergeJoey Hess2016-05-16
* assistant: Fix race in v6 mode that caused downloaded file content to sometim...Joey Hess2016-05-16
* assistant: Deal with upcoming git's refusal to merge unrelated histories by d...Joey Hess2016-04-22
* make assistant aware of adjusted branches when mergingJoey Hess2016-02-29
* update my email address and homepage urlJoey Hess2015-01-21
* Really fix bug that caused the assistant to make many unncessary empty merge ...Joey Hess2014-07-09
* assistant: Fix bug, introduced in last release, that caused the assistant to ...Joey Hess2014-07-05
* support commit.gpgsignJoey Hess2014-07-04
* annex.startupscan can be set to false to disable the assistant's startup scan.Joey Hess2014-03-05
* sync: Automatically resolve merge conflict between and annexed file and a reg...Joey Hess2014-03-04
* factor out Annex.AutoMerge from Command.SyncJoey Hess2014-03-04
* remove Read instance for RefJoey Hess2014-02-19
* hlintJoey Hess2013-10-02
* assistant: Fix bug that could cause incoming pushes to not get merged into th...Joey Hess2013-04-30
* let's put type modules under the parent module, not in a Types directoryJoey Hess2013-03-10
* tag xmpp pushes with jidJoey Hess2013-03-06
* assistant: Get back in sync with XMPP remotes after network reconnection, and...Joey Hess2013-03-06
* add additional debug info about reasons for transfersJoey Hess2013-03-01
* webapp: Now allows restarting any threads that crash.Joey Hess2013-01-26
* use sync command merge engine in assistantJoey Hess2012-12-25
* where indentationJoey Hess2012-10-31
* finished pushing Assistant monad into all relevant filesJoey Hess2012-10-30
* split BranchChange and liftedJoey Hess2012-10-29
* converted 6 more threadsJoey Hess2012-10-29
* Assistant monad, stage 2.5Joey Hess2012-10-29
* add ConfigMonitor threadJoey Hess2012-10-20
* use gitRepoJoey Hess2012-10-12
* run current branch merge in annex monadJoey Hess2012-09-17
* deferred downloadsJoey Hess2012-09-17
* better name for fallback sync refsJoey Hess2012-09-16
* ensure outgoing sync pushes always succeed when repo is accessibleJoey Hess2012-09-16
* make the merger merge any equivilant sync branch into the current branchJoey Hess2012-09-16
* hlintJoey Hess2012-09-13
* display errors when any named thread crashesJoey Hess2012-09-06
* cleanupJoey Hess2012-08-26
* refactorJoey Hess2012-08-22
* handle case of adding populated drive to just created repoJoey Hess2012-08-05
* build fixesJoey Hess2012-07-25
* debugging improvementsJoey Hess2012-07-20
* MVar deadlock problem seems to be fixed by previous commitJoey Hess2012-06-28
* improve thread termination handlingJoey Hess2012-06-28
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 19:57:21 +0000