index
:
git-annex-gpl
master
git-annex without the AGPL
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
Assistant
/
Threads
/
Merger.hs
Commit message (
Expand
)
Author
Age
*
use gitRepo
Joey Hess
2012-10-12
*
run current branch merge in annex monad
Joey Hess
2012-09-17
*
deferred downloads
Joey Hess
2012-09-17
*
better name for fallback sync refs
Joey Hess
2012-09-16
*
ensure outgoing sync pushes always succeed when repo is accessible
Joey Hess
2012-09-16
*
make the merger merge any equivilant sync branch into the current branch
Joey Hess
2012-09-16
*
hlint
Joey Hess
2012-09-13
*
display errors when any named thread crashes
Joey Hess
2012-09-06
*
cleanup
Joey Hess
2012-08-26
*
refactor
Joey Hess
2012-08-22
*
handle case of adding populated drive to just created repo
Joey Hess
2012-08-05
*
build fixes
Joey Hess
2012-07-25
*
debugging improvements
Joey Hess
2012-07-20
*
MVar deadlock problem seems to be fixed by previous commit
Joey Hess
2012-06-28
*
improve thread termination handling
Joey Hess
2012-06-28
*
tweak
Joey Hess
2012-06-28
*
merge conflict resolution now working
Joey Hess
2012-06-27
*
actually fetch from remote when doing a manual pull
Joey Hess
2012-06-27
*
automatic conflict resolution for assistant
Joey Hess
2012-06-27
*
fixup merges now done when needed
Joey Hess
2012-06-25
*
reorg threads
Joey Hess
2012-06-25