summaryrefslogtreecommitdiff
path: root/Annex/AdjustedBranch.hs
Commit message (Expand)AuthorAge
* configuration to disable automatic merge conflict resolutionGravatar Joey Hess2017-06-01
* workaround is in placeGravatar Joey Hess2017-05-16
* Work around bug in git 2.13.0 involving GIT_COMMON_DIR that broke merging cha...Gravatar Joey Hess2017-05-16
* Avoid backtraces on expected failures when built with ghc 8; only use backtra...Gravatar Joey Hess2016-11-15
* fix bugs in handing of deep branches with sync and adjusted branchesGravatar Joey Hess2016-09-21
* v6: Fix bad merge in an adjusted branch that resulted in an empty tree.Gravatar Joey Hess2016-06-13
* Fix bug in initialization of clone from a repo with an adjusted branch that h...Gravatar Joey Hess2016-06-09
* Fix initialization of a bare clone of a repo that has an adjusted branch chec...Gravatar Joey Hess2016-06-02
* better avoid switching to direct mode in clone of adjusted branch repoGravatar Joey Hess2016-06-02
* Automatically enable v6 mode when initializing in a clone from a repo that ha...Gravatar Joey Hess2016-06-02
* fix recent test suite reversionGravatar Joey Hess2016-05-23
* adjust: Add --fix adjustment, which is useful when the git directory is in a ...Gravatar Joey Hess2016-05-16
* adjust: If the adjusted branch already exists, avoid overwriting it, since it...Gravatar Joey Hess2016-05-13
* more windows path fixesGravatar Joey Hess2016-05-04
* 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
* 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
* 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
* 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
* remove hashPointerFile'Gravatar Joey Hess2016-03-29
* 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
* 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
* 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
* 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
* make sync aware of adjusted branchesGravatar Joey Hess2016-02-29
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-05 14:28:41 +0000