| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | 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 |
| * | use a TMVar | Joey Hess | 2012-06-26 |
| * | fixup merges now done when needed | Joey Hess | 2012-06-25 |
| * | add a push retry thread | Joey Hess | 2012-06-25 |
| * | reorg threads | Joey Hess | 2012-06-25 |
 |
index : git-annex-gpl | |
| git-annex without the AGPL |
| aboutsummaryrefslogtreecommitdiff |