Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| * | improving transfer data types and design | 2012-06-29 | ||
| * | add news item for git-annex 3.20120629 | 2012-06-29 | ||
| * | releasing version 3.201206293.20120629 | 2012-06-29 | ||
| * | Merge branch 'master' of ssh://git-annex.branchable.com | 2012-06-29 | ||
| |\ | ||||
| * | | further design | 2012-06-29 | ||
| * | | pointlessness | 2012-06-29 | ||
| | * | Added a comment | 2012-06-29 | ||
| |/ | ||||
* | | simplify | 2012-06-28 | ||
* | | refactor | 2012-06-28 | ||
| * | blog for the day | 2012-06-28 | ||
* | | blog for the day | 2012-06-28 | ||
* | | update | 2012-06-28 | ||
* | | typo | 2012-06-28 | ||
* | | fix kqueue build | 2012-06-28 | ||
| * | update | 2012-06-28 | ||
| * | post my current set of ideas for handling unlocking | 2012-06-28 | ||
* | | MVar deadlock problem seems to be fixed by previous commit | 2012-06-28 | ||
* | | improve thread termination handling | 2012-06-28 | ||
* | | tweak | 2012-06-28 | ||
| * | Added a comment | 2012-06-28 | ||
| * | (no commit message) | 2012-06-28 | ||
| * | update | 2012-06-27 | ||
* | | merge conflict resolution now working | 2012-06-27 | ||
* | | actually fetch from remote when doing a manual pull | 2012-06-27 | ||
* | | automatic conflict resolution for assistant | 2012-06-27 | ||
* | | Merge branch 'master' into assistant | 2012-06-27 | ||
|\| | ||||
| * | typo | 2012-06-27 | ||
| * | (no commit message) | 2012-06-27 | ||
| * | (no commit message) | 2012-06-27 | ||
| * | typo | 2012-06-27 | ||
| * | blog for the day | 2012-06-27 | ||
* | | Merge branch 'master' into assistant | 2012-06-27 | ||
|\| | ||||
| * | Merge branch 'master' of ssh://git-annex.branchable.com | 2012-06-27 | ||
| |\ | ||||
| * \ | Merge branch 'automerge' | 2012-06-27 | ||
| |\ \ | ||||
| | * | | use "variant" rather than "version" | 2012-06-27 | ||
| | * | | better filenames for conflict resolution files | 2012-06-27 | ||
| | * | | commit merge resolution | 2012-06-27 | ||
| | * | | fix file name | 2012-06-27 | ||
| * | | | close | 2012-06-27 | ||
| | * | | don't automerge when the symlinks cannot be parsed as keys | 2012-06-27 | ||
| | * | | sync: Automatically resolves merge conflicts. | 2012-06-27 | ||
| | * | | properly handle deleted files when processing ls-files --unmerged | 2012-06-27 | ||
| |/ / | ||||
| * | | add ls-files --unmerged support | 2012-06-27 | ||
| | * | Added a comment | 2012-06-27 | ||
| | * | Added a comment | 2012-06-27 | ||
| | * | Added a comment | 2012-06-27 | ||
| | * | (no commit message) | 2012-06-27 | ||
| | * | Added a comment | 2012-06-27 | ||
| |/ | ||||
| * | git-config fileEncoding | 2012-06-26 | ||
| * | Got rid of the last place that did utf8 decoding. | 2012-06-26 |