Commit graph

9 commits

Author SHA1 Message Date
http://joeyh.name/
f737ede24b Added a comment 2014-03-26 18:56:30 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc
8e813ee106 Added a comment: merge for master branch? 2014-03-23 23:02:23 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc
1124a7d8bd removed 2014-03-23 23:00:44 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc
82c3603704 Added a comment: merge only for metadata branch? 2014-03-23 22:59:52 +00:00
Joey Hess
63535e3dc7 Merge branch 'master' of ssh://git-annex.branchable.com 2014-03-20 12:13:45 -04:00
http://joeyh.name/
f97904f947 Added a comment 2014-03-20 16:10:11 +00:00
Joey Hess
fac8198a2f fix up old comments that used format=txt, which is no longer enabled 2014-03-20 12:09:09 -04:00
https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc
667ba2bbb9 Added a comment: Use automatic merge without syncing 2014-03-20 10:03:41 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnJTqmRu1YCKS2Hsm4vtOflLhP4fU-k98w
cb91f3c86a Added a comment: Customise conflict resolution behaviour 2014-02-25 11:42:08 +00:00