summaryrefslogtreecommitdiff
path: root/Annex/Direct.hs
Commit message (Expand)AuthorAge
* fix bugs involving v7 unlocked files and direct modeJoey Hess2018-12-11
* avoid update-index raceJoey Hess2018-08-17
* enable LambdaCase and convert around 10% of places that could use itJoey Hess2017-11-15
* fix bug introduced in 07f1e638ee9d693f7df62b5c738a463805b8b649Joey Hess2017-02-28
* annex.securehashesonlyJoey Hess2017-02-27
* Some optimisations to string splitting code.Joey Hess2017-01-31
* assistant: Deal with upcoming git's refusal to merge unrelated histories by d...Joey Hess2016-04-22
* run out of tree merge with --no-ffJoey Hess2016-04-06
* new method for merging changes into adjusted branch that avoids unncessary me...Joey Hess2016-04-06
* add reflog messagesJoey Hess2016-03-31
* remove 163 lines of code without changing anything except importsJoey Hess2016-01-20
* reorgJoey Hess2015-12-15
* move InodeSentinal from direct mode code to its own moduleJoey Hess2015-12-09
* support pointer filesJoey Hess2015-12-07
* do tmp dir cleanup in error case tooJoey Hess2015-10-15
* avoid making post-merge-conflict-resolution commit when no conflicts were res...Joey Hess2015-10-15
* Improve robustness of direct mode merge, avoiding a crash if the index file i...Joey Hess2015-09-22
* proxy: Fix proxy git commit of non-annexed files in direct mode.Joey Hess2015-08-04
* Submodules are now supported by git-annex!Joey Hess2015-03-02
* Repository tuning parameters can now be passed when initializing a repository...Joey Hess2015-01-27
* update my email address and homepage urlJoey Hess2015-01-21
* on second thought, InodeCache should use getFileSizeJoey Hess2015-01-20
* convert parentDir to be based on takeDirectory, but fixed for trailing /Joey Hess2015-01-09
* revert parentDir changeJoey Hess2015-01-09
* Merge branch 'master' into relativepathsJoey Hess2015-01-06
|\
| * made parentDir return a Maybe FilePath; removed most uses of itJoey Hess2015-01-06
* | direct mode merge relative path trickinessJoey Hess2015-01-06
|/
* proxy: for all your direct mode repository munging needsJoey Hess2014-11-12
* fix some mixed space+tab indentationJoey Hess2014-10-09
* Do not preserve permissions and acls when copying files from one local git re...Joey Hess2014-08-26
* direct: Avoid leaving file content in misctemp if interrupted.Joey Hess2014-08-15
* unify exception handling into Utility.ExceptionJoey Hess2014-08-07
* direct: Fix handling of case where a work tree subdirectory cannot be written...Joey Hess2014-07-10
* refactor lockingJoey Hess2014-07-10
* fix windows buildJoey Hess2014-07-09
* prospective fix for bad_merge_commit_deleting_all_filesJoey Hess2014-07-09
* support commit.gpgsignJoey Hess2014-07-04
* work around a bug in gitJoey Hess2014-06-12
* finish fixing windows timezone madnessJoey Hess2014-06-12
* fix for Windows file timestamp timezone madnessJoey Hess2014-06-12
* avoid fast-forwarding when a merge conflict was auto-resolvedJoey Hess2014-06-09
* avoid bad commits after interrupted direct mode sync (or merge)Joey Hess2014-06-09
* finish fixing direct mode merge bug involving unstaged local filesJoey Hess2014-03-04
* fix 1192d987218fd4ef13aa5e90c5de9091c4466c5d to handle annexed files in confl...Joey Hess2014-03-03
* sync: Fix bug in direct mode that caused a file not checked into git to be de...Joey Hess2014-03-03
* remove Read instance for RefJoey Hess2014-02-19
* random hlint (to give the autobuilder something new to build)Joey Hess2014-02-11
* Fix direct mode's handling when modifications to non-annexed files are pulled...Joey Hess2013-12-12
* format commentJoey Hess2013-12-12
* Avoid using git commit in direct mode, since in some situations it will read ...Joey Hess2013-12-01
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 18:44:23 +0000