summaryrefslogtreecommitdiff
path: root/doc/todo
Commit message (Collapse)AuthorAge
* sync: When there are merge conflicts that get automatically resolved, exit ↵Gravatar Joey Hess2013-11-07
| | | | nonzero at the end.
* Merge branch 'directguard'Gravatar Joey Hess2013-11-07
|\
* | (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkkyBDsfOB7JZvPZ4a8F3rwv0wk6Nb9n482013-11-07
| |
| * Merge branch 'master' into directguardGravatar Joey Hess2013-11-06
| |\ | |/ |/|
| * work around lack of receive.denyCurrentBranch in direct modeGravatar Joey Hess2013-11-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that direct mode sets core.bare=true, git's normal prohibition about pushing into the currently checked out branch doesn't work. A simple fix for this would be an update hook which blocks the pushes.. but git hooks must be executable, and git-annex needs to be usable on eg, FAT, which lacks x bits. Instead, enabling direct mode switches the branch (eg master) to a special purpose branch (eg annex/direct/master). This branch is not pushed when syncing; instead any changes that git annex sync commits get written to master, and it's pushed (along with synced/master) to the remote. Note that initialization has been changed to always call setDirect, even if it's just setDirect False for indirect mode. This is needed because if the user has just cloned a direct mode repo, that nothing has synced with before, it may have no master branch, and only a annex/direct/master. Resulting in that branch being checked out locally too. Calling setDirect False for indirect mode moves back out of this branch, to a new master branch, and ensures that a manual "git push" doesn't push changes directly to the annex/direct/master of the remote. (It's possible that the user makes a commit w/o using git-annex and pushes it, but nothing I can do about that really.) This commit was sponsored by Jonathan Harrington.
* | Added a comment: feedbackGravatar https://www.google.com/accounts/o8/id?id=AItOawne_amN4fko4p5cRY_9EYwaYuJKNn7LRio2013-11-05
| |
| * v5 for direct mode, with automatic upgradeGravatar Joey Hess2013-11-05
| | | | | | | | | | This includes storing the current state of the HEAD ref, which git annex sync is going to need, but does not make sync use it.
* | Added a commentGravatar http://joeyh.name/2013-11-05
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-11-04
|\
* | devblogGravatar Joey Hess2013-11-04
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawne_amN4fko4p5cRY_9EYwaYuJKNn7LRio2013-11-04
|/
* (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR82013-11-04
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-11-02
|\
* | respondGravatar Joey Hess2013-11-02
| |
| * Added a commentGravatar http://joeyh.name/2013-11-03
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-11-02
|\
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU2013-11-02
| |
| * Added a commentGravatar http://joeyh.name/2013-11-02
| |
* | respondGravatar Joey Hess2013-11-02
|/
* (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU2013-11-02
|
* (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU2013-11-02
|
* (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmNu4V5fvpLlBhaCUfXXOB0MI5NXwh8SkU2013-11-02
|
* addGravatar Joey Hess2013-11-02
|
* Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawnWwEEA3CurHkBjIYaJsJzFc4jtY2SCkrQ2013-10-29
|
* add --want-get and --want-drop optionsGravatar Joey Hess2013-10-28
| | | | | New --want-get and --want-drop options which can be used to test preferred content settings. For example, "git annex find --in . --want-drop"
* Added a commentGravatar http://joeyh.name/2013-10-28
|
* (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawnWwEEA3CurHkBjIYaJsJzFc4jtY2SCkrQ2013-10-28
|
* removedGravatar lorenzo2013-10-27
|
* Added a comment: Running Debian squeeze binaries on libc 2.5 based NASGravatar lorenzo2013-10-27
|
* Added a comment: Running Debian squeeze binaries on libc 2.5 based NASGravatar lorenzo2013-10-27
|
* thoughtGravatar Joey Hess2013-10-26
|
* move wishlist todo from forumGravatar Joey Hess2013-10-26
|
* Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawmVE2R20dyfPQIzdi6urVUUAXtD6eeBsr02013-10-19
|
* removedGravatar https://www.google.com/accounts/o8/id?id=AItOawmVE2R20dyfPQIzdi6urVUUAXtD6eeBsr02013-10-19
|
* Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawmVE2R20dyfPQIzdi6urVUUAXtD6eeBsr02013-10-19
|
* Added a commentGravatar http://joeyh.name/2013-10-19
|
* (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmVE2R20dyfPQIzdi6urVUUAXtD6eeBsr02013-10-19
|
* Added a comment: +1Gravatar https://www.google.com/accounts/o8/id?id=AItOawlhE8Xar6m4x3JSILXdm-Y5KhwHTH5qzKQ2013-10-14
|
* (no commit message)Gravatar GLITTAH2013-10-13
|
* Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w2013-10-07
|
* Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w2013-10-05
|
* Added a commentGravatar http://joeyh.name/2013-10-04
|
* Added a commentGravatar http://joeyh.name/2013-10-04
|
* (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w2013-10-04
|
* (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawnpdM9F8VbtQ_H5PaPMpGSxPe_d5L1eJ6w2013-10-04
|
* Added a comment: How should this interact with the trust model and location ↵Gravatar http://cstork.org/2013-10-04
| | | | tracking?
* assistant: More robust inotify handling; avoid crashing if a directory ↵Gravatar Joey Hess2013-09-30
| | | | cannot be read.
* Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawl-g0hYpGY11pBP_42lHh5GWTyFuB4UwH82013-09-25
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-09-25
|\
| * Added a commentGravatar http://joeyh.name/2013-09-25
| |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-25 20:00:51 +0000