| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | style |  Joey Hess | 2014-03-04 |
| * | sync: Automatically resolve merge conflict between and annexed file and a reg... | Joey Hess | 2014-03-04 |
| * | factor out Annex.AutoMerge from Command.Sync | Joey Hess | 2014-03-04 |
 |
index : git-annex-gpl | |
| git-annex without the AGPL |
| summaryrefslogtreecommitdiff |