summaryrefslogtreecommitdiff
path: root/doc/design/adjusted_branches.mdwn
Commit message (Expand)AuthorAge
* link to the adjust manpageGravatar anarcat2016-06-23
* minor typo fixes throughoutGravatar Yaroslav Halchenko2016-06-02
* updateGravatar Joey Hess2016-04-12
* fix master push overwrite race when updating adjusted branch, by maintaining ...Gravatar Joey Hess2016-04-09
* hard links on windowsGravatar Joey Hess2016-04-08
* avoid withWorkTreeRelated affecting annex symlink calculationGravatar Joey Hess2016-04-08
* one little bug..Gravatar Joey Hess2016-04-06
* 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
* todoGravatar Joey Hess2016-04-04
* still bug with sync in adjusted branchGravatar Joey Hess2016-04-04
* deal with cloning a repo that has an ajdusted branch checked outGravatar Joey Hess2016-04-04
* updateGravatar Joey Hess2016-04-04
* Upgrading a direct mode repository to v6 has changed to enter an adjusted unl...Gravatar Joey Hess2016-04-04
* remove old bugGravatar Joey Hess2016-03-31
* fixed merging of changes from adjusted branch + a remoteGravatar Joey Hess2016-03-31
* made some progress on syncing adjusted branches, but still buggyGravatar Joey Hess2016-03-31
* todoGravatar Joey Hess2016-03-29
* todoGravatar Joey Hess2016-03-29
* prevent git-annex adjust changing things out from under the daemonGravatar Joey Hess2016-03-29
* updateGravatar Joey Hess2016-03-29
* git annex add in adjusted unlocked branchGravatar Joey Hess2016-03-29
* updaeGravatar Joey Hess2016-03-29
* updateGravatar Joey Hess2016-03-11
* simplifyGravatar Joey Hess2016-03-11
* improve propigation of commits from adjusted branchesGravatar Joey Hess2016-03-11
* Merge branch 'master' into adjustedbranchGravatar Joey Hess2016-03-11
|\
| * thought on reversing commits to adjusted branchGravatar Joey Hess2016-03-04
* | working toward adjusted commit propigationGravatar Joey Hess2016-03-03
* | can't checkout adjusted branch while index is still lockedGravatar Joey Hess2016-03-03
* | need to update masterGravatar Joey Hess2016-02-29
* | note a bugGravatar Joey Hess2016-02-29
|/
* updatesGravatar Joey Hess2016-02-23
* updatesGravatar Joey Hess2016-02-22
* updatesGravatar Joey Hess2016-02-22
* updateGravatar Joey Hess2016-02-09
* updateGravatar Joey Hess2016-02-09
* cleanuGravatar Joey Hess2016-02-09
* simplify; no need for separate filter reversal functionGravatar Joey Hess2016-02-09
* improveGravatar Joey Hess2016-02-09
* improve api, removing IOGravatar Joey Hess2016-02-09
* add RenameFileGravatar Joey Hess2016-02-09
* updateGravatar Joey Hess2016-02-09
* updateGravatar Joey Hess2016-02-09
* updateGravatar Joey Hess2016-02-09
* updateGravatar Joey Hess2016-02-09
* push detailsGravatar Joey Hess2016-02-09
* commit detailsGravatar Joey Hess2016-02-09
* integration with view branchesGravatar Joey Hess2016-02-09
* stacking filtersGravatar Joey Hess2016-02-09