summaryrefslogtreecommitdiff
path: root/Annex
Commit message (Expand)AuthorAge
...
* adjust: Add --fix adjustment, which is useful when the git directory is in a ...Gravatar Joey Hess2016-05-16
* move keys db closure to AutoMergeGravatar Joey Hess2016-05-16
* adjust: If the adjusted branch already exists, avoid overwriting it, since it...Gravatar Joey Hess2016-05-13
* In the unusual configuration where annex.crippledfilesystem=true but core.sym...Gravatar Joey Hess2016-05-10
* improve commentGravatar Joey Hess2016-05-10
* Windows: Fix an over-long temp directory name.Gravatar Joey Hess2016-05-06
* fix build warning on windowsGravatar Joey Hess2016-05-05
* more windows path fixesGravatar Joey Hess2016-05-04
* avoid warnings about not exported System.Directory.isSymbolicLinkGravatar Joey Hess2016-04-28
* Fix build with directory-1.2.6.2.Gravatar Joey Hess2016-04-28
* assistant: Deal with upcoming git's refusal to merge unrelated histories by d...Gravatar Joey Hess2016-04-22
* adjusted branches need git 2.2.0 or newerGravatar Joey Hess2016-04-22
* Fix bug that prevented annex.sshcaching=false configuration from taking effec...Gravatar Joey Hess2016-04-20
* reinject: When src file's content cannot be verified, leave it alone, instead...Gravatar Joey Hess2016-04-20
* fsck: Warn when core.sharedRepository is set and an annex object file's write...Gravatar Joey Hess2016-04-14
* Preserve execute bits of unlocked files in v6 mode.Gravatar Joey Hess2016-04-14
* add AdjBranch newtype; some simplicationsGravatar Joey Hess2016-04-09
* 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
|\|
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-31 09:56:16 +0000