summaryrefslogtreecommitdiff
path: root/Annex
Commit message (Expand)AuthorAge
* change name of basis branchGravatar Joey Hess2016-04-09
* fix master push overwrite race when updating adjusted branch, by maintaining ...Gravatar Joey Hess2016-04-09
* hard links on windowsGravatar Joey Hess2016-04-08
* avoid withWorkTreeRelated affecting annex symlink calculationGravatar Joey Hess2016-04-08
* fix commit tree after merge into adjusted branchGravatar Joey Hess2016-04-06
* run out of tree merge with --no-ffGravatar Joey Hess2016-04-06
* fix auto merge conflict resolution when doing out of tree merge for adjusted ...Gravatar Joey Hess2016-04-06
* new method for merging changes into adjusted branch that avoids unncessary me...Gravatar Joey Hess2016-04-06
* v6: Close pointer file handles more quickly, to avoid problems on Windows.Gravatar Joey Hess2016-04-04
* todoGravatar Joey Hess2016-04-04
* deal with cloning a repo that has an ajdusted branch checked outGravatar Joey Hess2016-04-04
* make way for git checkout outputGravatar Joey Hess2016-04-04
* Upgrading a direct mode repository to v6 has changed to enter an adjusted unl...Gravatar Joey Hess2016-04-04
* fixed merging of changes from adjusted branch + a remoteGravatar Joey Hess2016-03-31
* made some progress on syncing adjusted branches, but still buggyGravatar Joey Hess2016-03-31
* add reflog messagesGravatar Joey Hess2016-03-31
* clean up handling of commit lockGravatar Joey Hess2016-03-31
* init: Automatically enter the adjusted unlocked branch when in a v6 repo on a...Gravatar Joey Hess2016-03-29
* git annex add in adjusted unlocked branchGravatar Joey Hess2016-03-29
* limit git annex adjust to v6 modeGravatar Joey Hess2016-03-29
* remove hashPointerFile'Gravatar Joey Hess2016-03-29
* Merge branch 'master' into adjustedbranchGravatar Joey Hess2016-03-29
|\
| * reuse annex's HashObjectHandleGravatar Joey Hess2016-03-14
| * Sped up git-annex merge by using git hash-object --batch.Gravatar Joey Hess2016-03-14
| * use hash-object --batchGravatar Joey Hess2016-03-14
| * Sped up git-annex add in direct mode and v6 by using git hash-object --batch.Gravatar Joey Hess2016-03-14
| * followupGravatar Joey Hess2016-03-14
| * Correct git-annex info to include unlocked files in v6 repository.Gravatar Joey Hess2016-03-14
* | implement another adjustment -- easy to do now!Gravatar Joey Hess2016-03-11
* | simplify adjustment reversalGravatar Joey Hess2016-03-11
* | fix deletion of files in adjustTreeGravatar Joey Hess2016-03-11
* | improve propigation of commits from adjusted branchesGravatar Joey Hess2016-03-11
* | Merge branch 'master' into adjustedbranchGravatar Joey Hess2016-03-11
|\|
| * refactorGravatar Joey Hess2016-03-09
| * Always try to thaw content, even when annex.crippledfilesystem is set.Gravatar Joey Hess2016-03-09
| * Merge branch 'no-cbits'Gravatar Joey Hess2016-03-05
| |\
* | | rebase on top of updated original branchGravatar Joey Hess2016-03-03
* | | fix abs filepath generationGravatar Joey Hess2016-03-03
* | | change name of adjusted branches to eg adjusted/master(unlocked)Gravatar Joey Hess2016-03-03
* | | working toward adjusted commit propigationGravatar Joey Hess2016-03-03
* | | Merge branch 'master' into adjustedbranchGravatar Joey Hess2016-03-03
|\| |
* | | can't checkout adjusted branch while index is still lockedGravatar Joey Hess2016-03-03
* | | push original branch, not adjusted branchGravatar Joey Hess2016-03-03
* | | lock index while making index-less commitsGravatar Joey Hess2016-03-03
| * | clarifyGravatar Joey Hess2016-03-01
| * | Fix data loss that can occur when annex.pidlock is set in a repository.Gravatar Joey Hess2016-03-01
* | | remove debugGravatar Joey Hess2016-02-29
* | | update keys database when adjusting branchesGravatar Joey Hess2016-02-29
* | | implement updateAdjustedBranchGravatar Joey Hess2016-02-29
* | | make assistant aware of adjusted branches when mergingGravatar Joey Hess2016-02-29
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-09 21:14:10 +0000