| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | adjusted branches need git 2.2.0 or newer |  Joey Hess | 2016-04-22 |
| | | | | | | | When git-annex is used with a git version older than 2.2.0, disable support for adjusted branches, since GIT_COMMON_DIR is needed to update them and was first added in that version of git. | ||
| * | 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 |
| | | | | | branch | ||
| * | new method for merging changes into adjusted branch that avoids unncessary ↵ | Joey Hess | 2016-04-06 |
| merge conflicts Still needs work when there are actual merge conflicts. | |||
 |
index : git-annex-gpl | |
| git-annex without the AGPL |
| summaryrefslogtreecommitdiff |