summaryrefslogtreecommitdiff
path: root/Annex/Direct.hs
Commit message (Expand)AuthorAge
* assistant: Deal with upcoming git's refusal to merge unrelated histories by d...Gravatar Joey Hess2016-04-22
* run out of tree merge with --no-ffGravatar Joey Hess2016-04-06
* new method for merging changes into adjusted branch that avoids unncessary me...Gravatar Joey Hess2016-04-06
* add reflog messagesGravatar Joey Hess2016-03-31
* remove 163 lines of code without changing anything except importsGravatar Joey Hess2016-01-20
* reorgGravatar Joey Hess2015-12-15
* move InodeSentinal from direct mode code to its own moduleGravatar Joey Hess2015-12-09
* support pointer filesGravatar Joey Hess2015-12-07
* do tmp dir cleanup in error case tooGravatar Joey Hess2015-10-15
* avoid making post-merge-conflict-resolution commit when no conflicts were res...Gravatar Joey Hess2015-10-15
* Improve robustness of direct mode merge, avoiding a crash if the index file i...Gravatar Joey Hess2015-09-22
* proxy: Fix proxy git commit of non-annexed files in direct mode.Gravatar Joey Hess2015-08-04
* Submodules are now supported by git-annex!Gravatar Joey Hess2015-03-02
* Repository tuning parameters can now be passed when initializing a repository...Gravatar Joey Hess2015-01-27
* update my email address and homepage urlGravatar Joey Hess2015-01-21
* on second thought, InodeCache should use getFileSizeGravatar Joey Hess2015-01-20
* convert parentDir to be based on takeDirectory, but fixed for trailing /Gravatar Joey Hess2015-01-09
* revert parentDir changeGravatar Joey Hess2015-01-09
* Merge branch 'master' into relativepathsGravatar Joey Hess2015-01-06
|\
| * made parentDir return a Maybe FilePath; removed most uses of itGravatar Joey Hess2015-01-06
* | direct mode merge relative path trickinessGravatar Joey Hess2015-01-06
|/
* proxy: for all your direct mode repository munging needsGravatar Joey Hess2014-11-12
* fix some mixed space+tab indentationGravatar Joey Hess2014-10-09
* Do not preserve permissions and acls when copying files from one local git re...Gravatar Joey Hess2014-08-26
* direct: Avoid leaving file content in misctemp if interrupted.Gravatar Joey Hess2014-08-15
* unify exception handling into Utility.ExceptionGravatar Joey Hess2014-08-07
* direct: Fix handling of case where a work tree subdirectory cannot be written...Gravatar Joey Hess2014-07-10
* refactor lockingGravatar Joey Hess2014-07-10
* fix windows buildGravatar Joey Hess2014-07-09
* prospective fix for bad_merge_commit_deleting_all_filesGravatar Joey Hess2014-07-09
* support commit.gpgsignGravatar Joey Hess2014-07-04
* work around a bug in gitGravatar Joey Hess2014-06-12
* finish fixing windows timezone madnessGravatar Joey Hess2014-06-12
* fix for Windows file timestamp timezone madnessGravatar Joey Hess2014-06-12
* avoid fast-forwarding when a merge conflict was auto-resolvedGravatar Joey Hess2014-06-09
* avoid bad commits after interrupted direct mode sync (or merge)Gravatar Joey Hess2014-06-09
* finish fixing direct mode merge bug involving unstaged local filesGravatar Joey Hess2014-03-04
* fix a9067868a8594577ead2ecbe55f9563bef12f26d to handle annexed files in confl...Gravatar Joey Hess2014-03-03
* sync: Fix bug in direct mode that caused a file not checked into git to be de...Gravatar Joey Hess2014-03-03
* remove Read instance for RefGravatar Joey Hess2014-02-19
* random hlint (to give the autobuilder something new to build)Gravatar Joey Hess2014-02-11
* Fix direct mode's handling when modifications to non-annexed files are pulled...Gravatar Joey Hess2013-12-12
* format commentGravatar Joey Hess2013-12-12
* Avoid using git commit in direct mode, since in some situations it will read ...Gravatar Joey Hess2013-12-01
* Direct mode .git/annex/objects directories are no longer left writableGravatar Joey Hess2013-11-15
* Fix direct mode merge bug when a direct mode file was deleted and replaced wi...Gravatar Joey Hess2013-11-15
* work around lack of receive.denyCurrentBranch in direct modeGravatar Joey Hess2013-11-05
* v5 for direct mode, with automatic upgradeGravatar Joey Hess2013-11-05
* update for DiffTree type change (which fixes assistant in subdir confusion bug)Gravatar Joey Hess2013-10-17
* ensure merge directory is empty before starting mergeGravatar Joey Hess2013-10-16
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-19 18:16:52 +0000