Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | (no commit message) | 2013-11-20 | |
| | |||
* | Added a comment | 2013-11-19 | |
| | |||
* | respond | 2013-11-19 | |
| | |||
* | (no commit message) | 2013-11-19 | |
| | |||
* | Added a comment | 2013-11-15 | |
| | |||
* | combine bugs | 2013-11-15 | |
| | |||
* | fix typo | 2013-11-15 | |
| | |||
* | (no commit message) | 2013-11-15 | |
| | |||
* | rename todo/Check_if_an_upgrade_is_available_in_webapp.mdwn to ↵ | 2013-11-15 | |
| | | | | todo/Check_if_an_upgrade_is_available_in_the_webapp.mdwn | ||
* | (no commit message) | 2013-11-15 | |
| | |||
* | Added a comment | 2013-11-13 | |
| | |||
* | work around for windows watcher cabal build problem | 2013-11-12 | |
| | |||
* | remove -Assistant from windows build flag | 2013-11-12 | |
| | |||
* | sync: When there are merge conflicts that get automatically resolved, exit ↵ | 2013-11-07 | |
| | | | | nonzero at the end. | ||
* | Merge branch 'directguard' | 2013-11-07 | |
|\ | |||
* | | (no commit message) | 2013-11-07 | |
| | | |||
| * | Merge branch 'master' into directguard | 2013-11-06 | |
| |\ | |/ |/| | |||
| * | work around lack of receive.denyCurrentBranch in direct mode | 2013-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: feedback | 2013-11-05 | |
| | | |||
| * | v5 for direct mode, with automatic upgrade | 2013-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 comment | 2013-11-05 | |
|/ | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | 2013-11-04 | |
|\ | |||
* | | devblog | 2013-11-04 | |
| | | |||
| * | (no commit message) | 2013-11-04 | |
|/ | |||
* | (no commit message) | 2013-11-04 | |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | 2013-11-02 | |
|\ | |||
* | | respond | 2013-11-02 | |
| | | |||
| * | Added a comment | 2013-11-03 | |
|/ | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | 2013-11-02 | |
|\ | |||
| * | Added a comment | 2013-11-02 | |
| | | |||
| * | Added a comment | 2013-11-02 | |
| | | |||
* | | respond | 2013-11-02 | |
|/ | |||
* | (no commit message) | 2013-11-02 | |
| | |||
* | (no commit message) | 2013-11-02 | |
| | |||
* | (no commit message) | 2013-11-02 | |
| | |||
* | add | 2013-11-02 | |
| | |||
* | Added a comment | 2013-10-29 | |
| | |||
* | add --want-get and --want-drop options | 2013-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 comment | 2013-10-28 | |
| | |||
* | (no commit message) | 2013-10-28 | |
| | |||
* | removed | 2013-10-27 | |
| | |||
* | Added a comment: Running Debian squeeze binaries on libc 2.5 based NAS | 2013-10-27 | |
| | |||
* | Added a comment: Running Debian squeeze binaries on libc 2.5 based NAS | 2013-10-27 | |
| | |||
* | thought | 2013-10-26 | |
| | |||
* | move wishlist todo from forum | 2013-10-26 | |
| | |||
* | Added a comment | 2013-10-19 | |
| | |||
* | removed | 2013-10-19 | |
| | |||
* | Added a comment | 2013-10-19 | |
| | |||
* | Added a comment | 2013-10-19 | |
| | |||
* | (no commit message) | 2013-10-19 | |
| |