summaryrefslogtreecommitdiff
path: root/doc
Commit message (Expand)AuthorAge
* Merge branch 'master' into assistantGravatar Joey Hess2012-06-27
|\
| * typoGravatar Joey Hess2012-06-27
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus2012-06-27
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus2012-06-27
| * typoGravatar Joey Hess2012-06-27
| * blog for the dayGravatar Joey Hess2012-06-27
* | Merge branch 'master' into assistantGravatar Joey Hess2012-06-27
|\|
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-06-27
| |\
| * \ Merge branch 'automerge'Gravatar Joey Hess2012-06-27
| |\ \
| * | | closeGravatar Joey Hess2012-06-27
| | * | sync: Automatically resolves merge conflicts.Gravatar Joey Hess2012-06-27
| |/ /
| | * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkWzAq6TusMi9zI3FLkDOETRIAUTtmGZVg2012-06-27
| | * Added a commentGravatar http://joeyh.name/2012-06-27
| | * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkwR9uOA38yi5kEUvcEWNtRiZwpxXskayE2012-06-27
| | * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus2012-06-27
| | * Added a commentGravatar http://joeyh.name/2012-06-27
| |/
| * Added a commentGravatar http://joeyh.name/2012-06-27
* | Merge branch 'master' into assistantGravatar Joey Hess2012-06-26
|\ \
| | * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkWzAq6TusMi9zI3FLkDOETRIAUTtmGZVg2012-06-27
| |/
| * blog for the dayGravatar Joey Hess2012-06-26
* | Merge branch 'master' into assistantGravatar Joey Hess2012-06-26
|\|
| * Avoid ugly failure mode when moving content from a local repository that is n...Gravatar Joey Hess2012-06-26
| * new bug I noticedGravatar Joey Hess2012-06-26
* | Merge branch 'master' into assistantGravatar Joey Hess2012-06-26
|\|
| * Version build dependency on STM, and allow building without it, which disable...Gravatar Joey Hess2012-06-26
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmURXBzaYE1gmVc-X9eLAyDat_6rHPl6702012-06-26
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmURXBzaYE1gmVc-X9eLAyDat_6rHPl6702012-06-26
| * blog for the dayGravatar Joey Hess2012-06-25
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-06-25
| |\
* | | fixup merges now done when neededGravatar Joey Hess2012-06-25
* | | Merge branch 'master' into assistantGravatar Joey Hess2012-06-25
|\| |
* | | add a push retry threadGravatar Joey Hess2012-06-25
| | * Added a commentGravatar http://joeyh.name/2012-06-25
| | * Added a commentGravatar http://joeyh.name/2012-06-25
| | * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus2012-06-25
| | * Added a commentGravatar http://joeyh.name/2012-06-25
| | * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus2012-06-25
| | * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus2012-06-25
| | * Added a commentGravatar http://joeyh.name/2012-06-25
| | * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus2012-06-25
| | * Added a comment: For the momentGravatar https://www.google.com/accounts/o8/id?id=AItOawkwR9uOA38yi5kEUvcEWNtRiZwpxXskayE2012-06-25
| | * Added a comment: Installation not working on OS X 10.6.8Gravatar https://www.google.com/accounts/o8/id?id=AItOawkwR9uOA38yi5kEUvcEWNtRiZwpxXskayE2012-06-25
| | * Added a comment: The fact that the keys changed causes merge conflictsGravatar https://www.google.com/accounts/o8/id?id=AItOawkjvjLHW9Omza7x1VEzIFQ8Z5honhRB90I2012-06-25
| * | typoGravatar Joey Hess2012-06-24
| |/
| * add news item for git-annex 3.20120624Gravatar Joey Hess2012-06-24
| * Added a commentGravatar http://joeyh.name/2012-06-23
* | Merge branch 'master' into assistantGravatar Joey Hess2012-06-23
|\|
| * fixedGravatar Joey Hess2012-06-23
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-06-23
| |\
| | * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus2012-06-23