summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| * improving transfer data types and designGravatar Joey Hess2012-06-29
| * add news item for git-annex 3.20120629Gravatar Joey Hess2012-06-29
| * releasing version 3.201206293.20120629Gravatar Joey Hess2012-06-29
| * Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-06-29
| |\
| * | further designGravatar Joey Hess2012-06-29
| * | pointlessnessGravatar Joey Hess2012-06-29
| | * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus2012-06-29
| |/
* | simplifyGravatar Joey Hess2012-06-28
* | refactorGravatar Joey Hess2012-06-28
| * blog for the dayGravatar Joey Hess2012-06-28
* | blog for the dayGravatar Joey Hess2012-06-28
* | updateGravatar Joey Hess2012-06-28
* | typoGravatar Joey Hess2012-06-28
* | fix kqueue buildGravatar Joey Hess2012-06-28
| * updateGravatar Joey Hess2012-06-28
| * post my current set of ideas for handling unlockingGravatar Joey Hess2012-06-28
* | MVar deadlock problem seems to be fixed by previous commitGravatar Joey Hess2012-06-28
* | improve thread termination handlingGravatar Joey Hess2012-06-28
* | tweakGravatar Joey Hess2012-06-28
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus2012-06-28
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmURXBzaYE1gmVc-X9eLAyDat_6rHPl6702012-06-28
| * updateGravatar Joey Hess2012-06-27
* | merge conflict resolution now workingGravatar Joey Hess2012-06-27
* | actually fetch from remote when doing a manual pullGravatar Joey Hess2012-06-27
* | automatic conflict resolution for assistantGravatar Joey Hess2012-06-27
* | 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
| |\ \
| | * | use "variant" rather than "version"Gravatar Joey Hess2012-06-27
| | * | better filenames for conflict resolution filesGravatar Joey Hess2012-06-27
| | * | commit merge resolutionGravatar Joey Hess2012-06-27
| | * | fix file nameGravatar Joey Hess2012-06-27
| * | | closeGravatar Joey Hess2012-06-27
| | * | don't automerge when the symlinks cannot be parsed as keysGravatar Joey Hess2012-06-27
| | * | sync: Automatically resolves merge conflicts.Gravatar Joey Hess2012-06-27
| | * | properly handle deleted files when processing ls-files --unmergedGravatar Joey Hess2012-06-27
| |/ /
| * | add ls-files --unmerged supportGravatar 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
| |/
| * git-config fileEncodingGravatar Joey Hess2012-06-26
| * Got rid of the last place that did utf8 decoding.Gravatar Joey Hess2012-06-26