summaryrefslogtreecommitdiff
path: root/Annex
Commit message (Expand)AuthorAge
* Merge branch 'master' into autosyncGravatar Joey Hess2011-12-30
|\
* | refactorGravatar Joey Hess2011-12-30
* | add forceUpdateGravatar Joey Hess2011-12-30
| * Merge branch 'new-monad-control'Gravatar Joey Hess2011-12-24
|/|
* | use Common in a few more modulesGravatar Joey Hess2011-12-20
* | split out Git/Command.hsGravatar Joey Hess2011-12-14
* | split more stuff out of Git.hsGravatar Joey Hess2011-12-14
* | move commit to Git.BranchGravatar Joey Hess2011-12-13
* | split out three modules from GitGravatar Joey Hess2011-12-13
* | avoid closing pipe before all the shas are read from itGravatar Joey Hess2011-12-12
* | broke out Git/HashObject.hsGravatar Joey Hess2011-12-12
* | broke out Git/Branch.hs and reorganizedGravatar Joey Hess2011-12-12
* | split out Git/Ref.hsGravatar Joey Hess2011-12-12
* | split out Annex/Journal.hsGravatar Joey Hess2011-12-12
* | split out Annex/BranchState.hsGravatar Joey Hess2011-12-12
* | update commentGravatar Joey Hess2011-12-12
* | optimisationGravatar Joey Hess2011-12-12
* | optimisationGravatar Joey Hess2011-12-12
* | cleanupGravatar Joey Hess2011-12-12
* | avoid redundant call to updateIndexGravatar Joey Hess2011-12-11
* | detect and recover from branch push/commit raceGravatar Joey Hess2011-12-11
| * Merge branch 'master' into new-monad-controlGravatar Joey Hess2011-12-11
| |\ | |/ |/|
* | optimize index updatingGravatar Joey Hess2011-12-11
* | slow, stupid, and safe index updatingGravatar Joey Hess2011-12-11
* | move a file location to Locations.hsGravatar Joey Hess2011-12-11
* | no need to show, it's a stringGravatar Joey Hess2011-12-10
* | hslintGravatar Joey Hess2011-12-09
| * adjust to build with monad-control-0.3Gravatar Joey Hess2011-12-05
|/
* cleanupGravatar Joey Hess2011-11-30
* add support for using hashDirLower in addition to hashDirMixedGravatar Joey Hess2011-11-28
* support .git/annex on a different disk than the rest of the repoGravatar Joey Hess2011-11-28
* tweaksGravatar Joey Hess2011-11-19
* tweakGravatar Joey Hess2011-11-19
* ensure branch exists before trying to update itGravatar Joey Hess2011-11-16
* improve type signatures with a Ref newtypeGravatar Joey Hess2011-11-16
* better nameGravatar Joey Hess2011-11-16
* merge: Now runs in constant space.Gravatar Joey Hess2011-11-15
* Optimised union merging; now only runs git cat-file once.Gravatar Joey Hess2011-11-12
* avoid unnecessary auto-merge when only changing a file in the branch.Gravatar Joey Hess2011-11-12
* merge: Improve commit messages to mention what was merged.Gravatar Joey Hess2011-11-12
* lintGravatar Joey Hess2011-11-11
* factored out some useful error catching methodsGravatar Joey Hess2011-11-10
* better message when content is lockedGravatar Joey Hess2011-11-10
* exclusive locks, ughGravatar Joey Hess2011-11-09
* content lockingGravatar Joey Hess2011-11-09
* safer inannex checkingGravatar Joey Hess2011-11-09
* reorg to allow taking content lockGravatar Joey Hess2011-11-09
* cleanupGravatar Joey Hess2011-11-09
* reorder repo parameters lastGravatar Joey Hess2011-11-08
* clean up read/show abuseGravatar Joey Hess2011-11-08