aboutsummaryrefslogtreecommitdiff
path: root/Annex/AutoMerge.hs
Commit message (Expand)AuthorAge
* Fix bad automatic merge conflict resolution between an annexed file and a dir...Gravatar Joey Hess2016-06-07
* move keys db closure to AutoMergeGravatar Joey Hess2016-05-16
* assistant: Deal with upcoming git's refusal to merge unrelated histories by d...Gravatar Joey Hess2016-04-22
* Preserve execute bits of unlocked files in v6 mode.Gravatar Joey Hess2016-04-14
* 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
* remove 163 lines of code without changing anything except importsGravatar Joey Hess2016-01-20
* fix one more test failure with v6 unlocked file merge conflict resolutionGravatar Joey Hess2016-01-08
* use TopFilePath for associated filesGravatar Joey Hess2016-01-05
* convert isPointerFile from Annex to IOGravatar Joey Hess2016-01-01
* flush queue before cleaning cruftGravatar Joey Hess2015-12-29
* test suite noticed a direct mode reversionGravatar Joey Hess2015-12-29
* renameGravatar Joey Hess2015-12-29
* don't disable smudge filter while mergingGravatar Joey Hess2015-12-29
* avoid renaming file when auto-resolving conflict in annex pointerGravatar Joey Hess2015-12-29
* automatic conflict resolution for v6 unlocked filesGravatar Joey Hess2015-12-29
* support pointer filesGravatar Joey Hess2015-12-07
* avoid making post-merge-conflict-resolution commit when no conflicts were res...Gravatar Joey Hess2015-10-15
* remove Params constructor from Utility.SafeCommandGravatar Joey Hess2015-06-01
* a few hlintsGravatar Joey Hess2015-04-11
* Repository tuning parameters can now be passed when initializing a repository...Gravatar Joey Hess2015-01-27
* update my email address and homepage urlGravatar Joey Hess2015-01-21
* resolvemerge: finish up by committingGravatar Joey Hess2014-07-11
* Deal with change in git 2.0 that made indirect mode merge conflict resolution...Gravatar Joey Hess2014-07-11
* resolvemerge: New plumbing command that runs the automatic merge conflict res...Gravatar Joey Hess2014-07-11
* fix build warning5.20140709Gravatar Joey Hess2014-07-09
* Fix bug in automatic merge conflict resolutionGravatar Joey Hess2014-07-08
* assistant: Fix bug, introduced in last release, that caused the assistant to ...Gravatar Joey Hess2014-07-05
* support commit.gpgsignGravatar Joey Hess2014-07-04
* simplifyGravatar Joey Hess2014-06-09
* avoid fast-forwarding when a merge conflict was auto-resolvedGravatar Joey Hess2014-06-09
* avoid bad commits after interrupted direct mode sync (or merge)Gravatar Joey Hess2014-06-09
* styleGravatar Joey Hess2014-03-04
* sync: Automatically resolve merge conflict between and annexed file and a reg...Gravatar Joey Hess2014-03-04
* factor out Annex.AutoMerge from Command.SyncGravatar Joey Hess2014-03-04
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-09 10:36:32 +0000