| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | Added a comment: auto conflict resolution |  https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc | 2014-04-19 |
| * | Added a comment |  http://joeyh.name/ | 2014-04-17 |
| * | Added a comment: auto conflict resolution master branch | https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc | 2014-04-13 |
| * | Added a comment | http://joeyh.name/ | 2014-03-26 |
| * | Added a comment: merge for master branch? | https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc | 2014-03-23 |
| * | removed | https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc | 2014-03-23 |
| * | Added a comment: merge only for metadata branch? | https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc | 2014-03-23 |
| * | Merge branch 'master' of ssh://git-annex.branchable.com |  Joey Hess | 2014-03-20 |
| |\ | |||
| | * | Added a comment | http://joeyh.name/ | 2014-03-20 |
| * | | fix up old comments that used format=txt, which is no longer enabled | Joey Hess | 2014-03-20 |
| |/ | |||
| * | Added a comment: Use automatic merge without syncing | https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc | 2014-03-20 |
| * | Added a comment: Customise conflict resolution behaviour |  https://www.google.com/accounts/o8/id?id=AItOawnJTqmRu1YCKS2Hsm4vtOflLhP4fU-k98w | 2014-02-25 |
 |
index : git-annex-gpl | |
| git-annex without the AGPL |
| summaryrefslogtreecommitdiff |