Commit message (Expand) | Author | Age | |
---|---|---|---|
* | adjusted branches need git 2.2.0 or newer | Joey Hess | 2016-04-22 |
* | avoid withWorkTreeRelated affecting annex symlink calculation | Joey Hess | 2016-04-08 |
* | fix auto merge conflict resolution when doing out of tree merge for adjusted ... | Joey Hess | 2016-04-06 |
* | new method for merging changes into adjusted branch that avoids unncessary me... | Joey Hess | 2016-04-06 |