summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Fix direct mode merge bug when a direct mode file was deleted and replaced ↵Gravatar Joey Hess2013-11-15
| | | | with a directory. An ordering problem caused the directory to not get created in this case. Thanks to Tim for the test cases.
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-11-15
|\
* | mac buildsGravatar Joey Hess2013-11-15
| |
| * (no commit message)Gravatar gueux2013-11-15
| |
| * Added a comment: So what does "git annex drop" do in direct mode?Gravatar https://www.google.com/accounts/o8/id?id=AItOawmkXtBdMgE1d9nCz2iBc4f85xh4izZ_auU2013-11-15
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U2013-11-15
| |
| * rename todo/Check_if_an_upgrade_is_available_in_webapp.mdwn to ↵Gravatar gueux2013-11-15
| | | | | | | | todo/Check_if_an_upgrade_is_available_in_the_webapp.mdwn
| * (no commit message)Gravatar gueux2013-11-15
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawn1QhtPvsRBV7pfaDW_ZTPFv_ZIxSzQ8Rg2013-11-15
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-11-14
|\
* | devblogGravatar Joey Hess2013-11-14
| |
| * Added a commentGravatar http://joeyh.name/2013-11-14
| |
| * Added a comment: Easy to fix.Gravatar https://www.google.com/accounts/o8/id?id=AItOawmkXtBdMgE1d9nCz2iBc4f85xh4izZ_auU2013-11-14
| |
| * added a gpg bugGravatar https://www.google.com/accounts/o8/id?id=AItOawmkXtBdMgE1d9nCz2iBc4f85xh4izZ_auU2013-11-14
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawnmF_9CAtfqdZkC4e-_dCX-rK5bqh4RWkw2013-11-14
| |
| * Added a comment: Using a portable drive as another transfer device? – cool.Gravatar https://www.google.com/accounts/o8/id?id=AItOawmkXtBdMgE1d9nCz2iBc4f85xh4izZ_auU2013-11-14
| |
| * Added a commentGravatar http://joeyh.name/2013-11-14
|/
* update test suite for status -> info renameGravatar Joey Hess2013-11-14
|
* fixGravatar Joey Hess2013-11-14
|
* formatGravatar Joey Hess2013-11-14
|
* on second thought, don't change sync to exit nonzero on successful ↵Gravatar Joey Hess2013-11-14
| | | | | | conflicted merge resolution For one thing, that breaks the test suite. May revisit later.
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-11-14
|\
* | mavericksGravatar Joey Hess2013-11-14
| |
* | add a note after successful conflicted merge resolutionGravatar Joey Hess2013-11-14
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg2013-11-14
| |
| * Added a comment: ConfirmedGravatar https://www.google.com/accounts/o8/id?id=AItOawlHNJ7FpiXJNwSmojlwKwXhhF5QvwpNPmI2013-11-14
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-11-14
|\
| * Added a commentGravatar http://joeyh.name/2013-11-14
| |
| * Added a commentGravatar http://joeyh.name/2013-11-14
| |
* | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-11-14
|\|
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg2013-11-14
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg2013-11-14
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg2013-11-14
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg2013-11-14
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg2013-11-14
| |
| * Added a commentGravatar http://joeyh.name/2013-11-14
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg2013-11-14
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg2013-11-14
| |
| * Added a commentGravatar http://id.clacke.se/2013-11-14
| |
| * (no commit message)Gravatar gueux2013-11-14
| |
| * Added a comment: Any further info regarding gitolite support?Gravatar https://www.google.com/accounts/o8/id?id=AItOawmbo-yMzW_lkBrS4ICNn5XMr8saYtI1_WY2013-11-14
| |
* | copied a very interesting comment from the poll siteGravatar Joey Hess2013-11-13
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-11-13
|\ | | | | | | | | | | | | Conflicts: doc/polls/2013/direct_vs_indirect_mode.mdwn doc/polls/2013/number_of_repositories.mdwn doc/polls/2013/using_for.mdwn
| * poll vote (personal data)Gravatar https://id.koumbit.net/anarcat2013-11-14
| |
* | polls moved (and synced)Gravatar Joey Hess2013-11-13
| |
| * poll vote (6-10)Gravatar https://id.koumbit.net/anarcat2013-11-14
| |
| * poll vote (I use mostly direct mode)Gravatar https://www.google.com/accounts/o8/id?id=AItOawn1QhtPvsRBV7pfaDW_ZTPFv_ZIxSzQ8Rg2013-11-14
|/
* moving to separate siteGravatar Joey Hess2013-11-13
|
* Added a comment: quite happyGravatar https://id.koumbit.net/anarcat2013-11-13
|
* poll vote (videos)Gravatar https://id.koumbit.net/anarcat2013-11-13
|