| Commit message (Expand) | Author | Age |
* | assistant: Deal with upcoming git's refusal to merge unrelated histories by d... | Joey Hess | 2016-04-22 |
* | run out of tree merge with --no-ff | Joey Hess | 2016-04-06 |
* | new method for merging changes into adjusted branch that avoids unncessary me... | Joey Hess | 2016-04-06 |
* | add reflog messages | Joey Hess | 2016-03-31 |
* | remove 163 lines of code without changing anything except imports | Joey Hess | 2016-01-20 |
* | reorg | Joey Hess | 2015-12-15 |
* | move InodeSentinal from direct mode code to its own module | Joey Hess | 2015-12-09 |
* | support pointer files | Joey Hess | 2015-12-07 |
* | do tmp dir cleanup in error case too | Joey Hess | 2015-10-15 |
* | avoid making post-merge-conflict-resolution commit when no conflicts were res... | Joey Hess | 2015-10-15 |
* | Improve robustness of direct mode merge, avoiding a crash if the index file i... | Joey Hess | 2015-09-22 |
* | proxy: Fix proxy git commit of non-annexed files in direct mode. | Joey Hess | 2015-08-04 |
* | Submodules are now supported by git-annex! | Joey Hess | 2015-03-02 |
* | Repository tuning parameters can now be passed when initializing a repository... | Joey Hess | 2015-01-27 |
* | update my email address and homepage url | Joey Hess | 2015-01-21 |
* | on second thought, InodeCache should use getFileSize | Joey Hess | 2015-01-20 |
* | convert parentDir to be based on takeDirectory, but fixed for trailing / | Joey Hess | 2015-01-09 |
* | revert parentDir change | Joey Hess | 2015-01-09 |
* | Merge branch 'master' into relativepaths | Joey Hess | 2015-01-06 |
|\ |
|
| * | made parentDir return a Maybe FilePath; removed most uses of it | Joey Hess | 2015-01-06 |
* | | direct mode merge relative path trickiness | Joey Hess | 2015-01-06 |
|/ |
|
* | proxy: for all your direct mode repository munging needs | Joey Hess | 2014-11-12 |
* | fix some mixed space+tab indentation | Joey Hess | 2014-10-09 |
* | Do not preserve permissions and acls when copying files from one local git re... | Joey Hess | 2014-08-26 |
* | direct: Avoid leaving file content in misctemp if interrupted. | Joey Hess | 2014-08-15 |
* | unify exception handling into Utility.Exception | Joey Hess | 2014-08-07 |
* | direct: Fix handling of case where a work tree subdirectory cannot be written... | Joey Hess | 2014-07-10 |
* | refactor locking | Joey Hess | 2014-07-10 |
* | fix windows build | Joey Hess | 2014-07-09 |
* | prospective fix for bad_merge_commit_deleting_all_files | Joey Hess | 2014-07-09 |
* | support commit.gpgsign | Joey Hess | 2014-07-04 |
* | work around a bug in git | Joey Hess | 2014-06-12 |
* | finish fixing windows timezone madness | Joey Hess | 2014-06-12 |
* | fix for Windows file timestamp timezone madness | Joey Hess | 2014-06-12 |
* | avoid fast-forwarding when a merge conflict was auto-resolved | Joey Hess | 2014-06-09 |
* | avoid bad commits after interrupted direct mode sync (or merge) | Joey Hess | 2014-06-09 |
* | finish fixing direct mode merge bug involving unstaged local files | Joey Hess | 2014-03-04 |
* | fix a9067868a8594577ead2ecbe55f9563bef12f26d to handle annexed files in confl... | Joey Hess | 2014-03-03 |
* | sync: Fix bug in direct mode that caused a file not checked into git to be de... | Joey Hess | 2014-03-03 |
* | remove Read instance for Ref | Joey Hess | 2014-02-19 |
* | random hlint (to give the autobuilder something new to build) | Joey Hess | 2014-02-11 |
* | Fix direct mode's handling when modifications to non-annexed files are pulled... | Joey Hess | 2013-12-12 |
* | format comment | Joey Hess | 2013-12-12 |
* | Avoid using git commit in direct mode, since in some situations it will read ... | Joey Hess | 2013-12-01 |
* | Direct mode .git/annex/objects directories are no longer left writable | Joey Hess | 2013-11-15 |
* | Fix direct mode merge bug when a direct mode file was deleted and replaced wi... | Joey Hess | 2013-11-15 |
* | work around lack of receive.denyCurrentBranch in direct mode | Joey Hess | 2013-11-05 |
* | v5 for direct mode, with automatic upgrade | Joey Hess | 2013-11-05 |
* | update for DiffTree type change (which fixes assistant in subdir confusion bug) | Joey Hess | 2013-10-17 |
* | ensure merge directory is empty before starting merge | Joey Hess | 2013-10-16 |