summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* fix build with path-pieces-0.1.4Gravatar Joey Hess2014-07-13
|
* bug closureGravatar Joey Hess2014-07-13
|
* (no commit message)Gravatar sts2014-07-13
|
* (no commit message)Gravatar lex2014-07-13
|
* (no commit message)Gravatar zardoz2014-07-12
|
* Added a comment: gitignoreGravatar http://ypid.wordpress.com/2014-07-12
|
* new feature: do not import new filesGravatar http://svario.it/gioele2014-07-12
|
* New bug "sync does not commit with alwasycommit = false"Gravatar http://svario.it/gioele2014-07-12
|
* Added a commentGravatar https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d82014-07-12
|
* Added a commentGravatar https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d82014-07-12
|
* New topic "Recovering from a bad sync"Gravatar http://svario.it/gioele2014-07-12
|
* (no commit message)Gravatar divB2014-07-12
|
* (no commit message)Gravatar divB2014-07-12
|
* Added a commentGravatar divB2014-07-11
|
* Added a commentGravatar divB2014-07-11
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-07-11
|\
* | devblogGravatar Joey Hess2014-07-11
| |
* | resolvemerge: finish up by committingGravatar Joey Hess2014-07-11
| |
* | Deal with change in git 2.0 that made indirect mode merge conflict ↵Gravatar Joey Hess2014-07-11
| | | | | | | | | | | | | | | | | | | | resolution leave behind old files. I think this is a git behavior change, but have not checked to be sure. Conflict cruft used to look like $foo~HEAD, but now just $foo is left behind as conflict cruft. With test case.
* | resolvemerge: New plumbing command that runs the automatic merge conflict ↵Gravatar Joey Hess2014-07-11
| | | | | | | | resolver.
| * Added a commentGravatar http://joeyh.name/2014-07-11
| |
| * Added a commentGravatar http://joeyh.name/2014-07-11
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-07-11
|\
* | moreinfoGravatar Joey Hess2014-07-11
| |
| * Added a commentGravatar http://joeyh.name/2014-07-11
| |
| * Added a commentGravatar http://joeyh.name/2014-07-11
| |
| * Added a commentGravatar http://joeyh.name/2014-07-11
| |
| * Added a comment: unable to reproduce, please provide transcriptGravatar http://joeyh.name/2014-07-11
| |
* | moreinfoGravatar Joey Hess2014-07-11
| |
| * Added a commentGravatar http://joeyh.name/2014-07-11
| |
| * Added a commentGravatar http://joeyh.name/2014-07-11
|/
* S3: Deal with AWS ACL configurations that do not allow creating or checking ↵Gravatar Joey Hess2014-07-11
| | | | the location of a bucket, but only reading and writing content to it.
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-07-11
|\
* | uninit: Avoid failing final removal in some direct mode repositories due to ↵Gravatar Joey Hess2014-07-11
| | | | | | | | | | | | file modes. Specifically .map files.
| * Added a commentGravatar http://joeyh.name/2014-07-11
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2014-07-11
|\
| * Added a commentGravatar http://joeyh.name/2014-07-11
| |
* | make commented out lines always give the default, not a suggested settingGravatar Joey Hess2014-07-11
| |
| * Added a commentGravatar http://joeyh.name/2014-07-11
| |
| * Added a commentGravatar http://joeyh.name/2014-07-11
| |
* | close; local misconfigurationGravatar Joey Hess2014-07-11
| |
| * Added a comment: obvious questionsGravatar http://joeyh.name/2014-07-11
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawncukUQl56TwiBJb7dIyAqP1YirNg_wjR42014-07-11
| |
* | improve documentation about syncGravatar Joey Hess2014-07-11
|/
* Added a commentGravatar http://joeyh.name/2014-07-11
|
* Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawncukUQl56TwiBJb7dIyAqP1YirNg_wjR42014-07-11
|
* Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawncukUQl56TwiBJb7dIyAqP1YirNg_wjR42014-07-11
|
* (no commit message)Gravatar zardoz2014-07-11
|
* Added a commentGravatar zardoz2014-07-11
|
* Added a commentGravatar zardoz2014-07-11
|