summaryrefslogtreecommitdiff
path: root/doc/design
Commit message (Expand)AuthorAge
* 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
* Added a commentGravatar szrc2016-04-05
* responseGravatar Joey Hess2016-04-04
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-04-04
|\
| * Clarified CHECKURL-MULTI syntaxGravatar 0xloem@0bd8a79a57e4f0dcade8fc81d162c37eae4d67302016-04-04
* | 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
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-04-04
|\
* | Upgrading a direct mode repository to v6 has changed to enter an adjusted unl...Gravatar Joey Hess2016-04-04
| * Added a comment: Local storage of credsGravatar szrc2016-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
* Merge branch 'master' into adjustedbranchGravatar Joey Hess2016-03-29
|\
| * poll vote (Same as for regular git-annex. ~/annex/)Gravatar 185.16.53.2252016-03-24
| * commentGravatar Joey Hess2016-03-14
| * rename files containing :Gravatar Joey Hess2016-03-12
* | 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
|/
* Added a comment: would it be possible to get a branch only with annexed content?Gravatar https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f42016-02-25
* updatesGravatar Joey Hess2016-02-23
* updatesGravatar Joey Hess2016-02-22
* updatesGravatar Joey Hess2016-02-22
* poll vote (My phone (or MP3 player))Gravatar 84.142.108.2332016-02-17
* 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-01 14:29:20 +0000