Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | link to the adjust manpage | 2016-06-23 | |
| | |||
* | minor typo fixes throughout | 2016-06-02 | |
| | | | | | problematic flexibility | ||
* | update | 2016-04-12 | |
| | |||
* | fix master push overwrite race when updating adjusted branch, by maintaining ↵ | 2016-04-09 | |
| | | | | basis ref | ||
* | hard links on windows | 2016-04-08 | |
| | | | | | * annex.thin and annex.hardlink are now supported on Windows. * unannex --fast now makes hard links on Windows. | ||
* | avoid withWorkTreeRelated affecting annex symlink calculation | 2016-04-08 | |
| | |||
* | one little bug.. | 2016-04-06 | |
| | |||
* | fix auto merge conflict resolution when doing out of tree merge for adjusted ↵ | 2016-04-06 | |
| | | | | branch | ||
* | new method for merging changes into adjusted branch that avoids unncessary ↵ | 2016-04-06 | |
| | | | | | | merge conflicts Still needs work when there are actual merge conflicts. | ||
* | todo | 2016-04-04 | |
| | |||
* | still bug with sync in adjusted branch | 2016-04-04 | |
| | |||
* | deal with cloning a repo that has an ajdusted branch checked out | 2016-04-04 | |
| | |||
* | update | 2016-04-04 | |
| | |||
* | Upgrading a direct mode repository to v6 has changed to enter an adjusted ↵ | 2016-04-04 | |
| | | | | | | | | unlocked branch. This makes the direct mode to v6 upgrade able to be performed in one clone of a repository without affecting other clones, which can continue using v5 and direct mode. | ||
* | remove old bug | 2016-03-31 | |
| | | | | I just fixed this one today; it was not the problem I thought it was. | ||
* | fixed merging of changes from adjusted branch + a remote | 2016-03-31 | |
| | |||
* | made some progress on syncing adjusted branches, but still buggy | 2016-03-31 | |
| | |||
* | todo | 2016-03-29 | |
| | |||
* | todo | 2016-03-29 | |
| | |||
* | prevent git-annex adjust changing things out from under the daemon | 2016-03-29 | |
| | |||
* | update | 2016-03-29 | |
| | |||
* | git annex add in adjusted unlocked branch | 2016-03-29 | |
| | | | | | Cached the current branch lookup just because it seems unnecessary overhead to run an extra git command per add to query the current branch. | ||
* | updae | 2016-03-29 | |
| | |||
* | update | 2016-03-11 | |
| | |||
* | simplify | 2016-03-11 | |
| | |||
* | improve propigation of commits from adjusted branches | 2016-03-11 | |
| | | | | | | | | | | | Only reverse adjust the changes in the commit, which means that adjustments do not need to be generally cleanly reversable. For example, an adjustment can unlock all locked files, but does not need to worry about files that were originally unlocked when reversing, because it will only ever be run on files that have been changed. So, it's ok if it locks all files when reversed, or even leaves all files as-is when reversed. | ||
* | Merge branch 'master' into adjustedbranch | 2016-03-11 | |
|\ | |||
| * | thought on reversing commits to adjusted branch | 2016-03-04 | |
| | | |||
* | | working toward adjusted commit propigation | 2016-03-03 | |
| | | |||
* | | can't checkout adjusted branch while index is still locked | 2016-03-03 | |
| | | | | | | | | | | | | | | There's a race here, but entering an adjusted branch for the first time is not something to do when a commit is being made at the same time. Although, may want to prevent the assistant from committing while entering the adjusted branch. | ||
* | | need to update master | 2016-02-29 | |
| | | |||
* | | note a bug | 2016-02-29 | |
|/ | |||
* | updates | 2016-02-23 | |
| | |||
* | updates | 2016-02-22 | |
| | |||
* | updates | 2016-02-22 | |
| | |||
* | update | 2016-02-09 | |
| | |||
* | update | 2016-02-09 | |
| | |||
* | cleanu | 2016-02-09 | |
| | |||
* | simplify; no need for separate filter reversal function | 2016-02-09 | |
| | |||
* | improve | 2016-02-09 | |
| | |||
* | improve api, removing IO | 2016-02-09 | |
| | |||
* | add RenameFile | 2016-02-09 | |
| | |||
* | update | 2016-02-09 | |
| | |||
* | update | 2016-02-09 | |
| | |||
* | update | 2016-02-09 | |
| | |||
* | update | 2016-02-09 | |
| | |||
* | push details | 2016-02-09 | |
| | |||
* | commit details | 2016-02-09 | |
| | |||
* | integration with view branches | 2016-02-09 | |
| | |||
* | stacking filters | 2016-02-09 | |
| |