summaryrefslogtreecommitdiff
path: root/Annex/GitOverlay.hs
Commit message (Expand)AuthorAge
* adjusted branches need git 2.2.0 or newerGravatar Joey Hess2016-04-22
* avoid withWorkTreeRelated affecting annex symlink calculationGravatar Joey Hess2016-04-08
* 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