summaryrefslogtreecommitdiff
path: root/Annex/AdjustedBranch.hs
Commit message (Expand)AuthorAge
* misctmp cleanupJoey Hess2019-01-17
* fix init in cripped filesystem version issuesJoey Hess2018-12-03
* fix strange test failureJoey Hess2018-10-22
* fix incomplete renaming of functionJoey Hess2018-10-22
* make sync update adjusted branch to hide/unhideJoey Hess2018-10-20
* document --forceJoey Hess2018-10-20
* refactor getCurrentBranchJoey Hess2018-10-19
* adjust --hide-missingJoey Hess2018-10-18
* improve types to allow combining some adjustmentsJoey Hess2018-10-18
* avoid update-index raceJoey Hess2018-08-17
* rename BlobType and add submodule to itJoey Hess2018-05-14
* finally really add back custom-setup stanzaJoey Hess2017-12-31
* enable LambdaCase and convert around 10% of places that could use itJoey Hess2017-11-15
* sync: Added --cleanup, which removes local and remote synced/ branches.Joey Hess2017-09-28
* configuration to disable automatic merge conflict resolutionJoey Hess2017-06-01
* workaround is in placeJoey Hess2017-05-16
* Work around bug in git 2.13.0 involving GIT_COMMON_DIR that broke merging cha...Joey Hess2017-05-16
* Avoid backtraces on expected failures when built with ghc 8; only use backtra...Joey Hess2016-11-15
* fix bugs in handing of deep branches with sync and adjusted branchesJoey Hess2016-09-21
* v6: Fix bad merge in an adjusted branch that resulted in an empty tree.Joey Hess2016-06-13
* Fix bug in initialization of clone from a repo with an adjusted branch that h...Joey Hess2016-06-09
* Fix initialization of a bare clone of a repo that has an adjusted branch chec...Joey Hess2016-06-02
* better avoid switching to direct mode in clone of adjusted branch repoJoey Hess2016-06-02
* Automatically enable v6 mode when initializing in a clone from a repo that ha...Joey Hess2016-06-02
* fix recent test suite reversionJoey Hess2016-05-23
* adjust: Add --fix adjustment, which is useful when the git directory is in a ...Joey Hess2016-05-16
* adjust: If the adjusted branch already exists, avoid overwriting it, since it...Joey Hess2016-05-13
* more windows path fixesJoey Hess2016-05-04
* assistant: Deal with upcoming git's refusal to merge unrelated histories by d...Joey Hess2016-04-22
* adjusted branches need git 2.2.0 or newerJoey Hess2016-04-22
* add AdjBranch newtype; some simplicationsJoey Hess2016-04-09
* change name of basis branchJoey Hess2016-04-09
* fix master push overwrite race when updating adjusted branch, by maintaining ...Joey Hess2016-04-09
* fix commit tree after merge into adjusted branchJoey Hess2016-04-06
* run out of tree merge with --no-ffJoey Hess2016-04-06
* fix auto merge conflict resolution when doing out of tree merge for adjusted ...Joey Hess2016-04-06
* new method for merging changes into adjusted branch that avoids unncessary me...Joey Hess2016-04-06
* todoJoey Hess2016-04-04
* deal with cloning a repo that has an ajdusted branch checked outJoey Hess2016-04-04
* make way for git checkout outputJoey Hess2016-04-04
* Upgrading a direct mode repository to v6 has changed to enter an adjusted unl...Joey Hess2016-04-04
* fixed merging of changes from adjusted branch + a remoteJoey Hess2016-03-31
* made some progress on syncing adjusted branches, but still buggyJoey Hess2016-03-31
* add reflog messagesJoey Hess2016-03-31
* clean up handling of commit lockJoey Hess2016-03-31
* init: Automatically enter the adjusted unlocked branch when in a v6 repo on a...Joey Hess2016-03-29
* git annex add in adjusted unlocked branchJoey Hess2016-03-29
* remove hashPointerFile'Joey Hess2016-03-29
* implement another adjustment -- easy to do now!Joey Hess2016-03-11
* simplify adjustment reversalJoey Hess2016-03-11
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 23:07:44 +0000