summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* releasing version 3.201206293.20120629Gravatar Joey Hess2012-06-29
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-06-29
|\
* | further designGravatar Joey Hess2012-06-29
| |
* | pointlessnessGravatar Joey Hess2012-06-29
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus2012-06-29
|/
* blog for the dayGravatar Joey Hess2012-06-28
|
* updateGravatar Joey Hess2012-06-28
|
* post my current set of ideas for handling unlockingGravatar Joey Hess2012-06-28
|
* Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus2012-06-28
|
* (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmURXBzaYE1gmVc-X9eLAyDat_6rHPl6702012-06-28
|
* updateGravatar Joey Hess2012-06-27
|
* typoGravatar Joey Hess2012-06-27
|
* (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus2012-06-27
|
* (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus2012-06-27
|
* typoGravatar Joey Hess2012-06-27
|
* blog for the dayGravatar Joey Hess2012-06-27
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-06-27
|\
* \ Merge branch 'automerge'Gravatar Joey Hess2012-06-27
|\ \
| * | use "variant" rather than "version"Gravatar Joey Hess2012-06-27
| | | | | | | | | | | | | | | | | | While this word may be less familiar to some users, it avoids the connotation that version 2 is better than version 1, which is wrong when the two variants were conflicting.
| * | better filenames for conflict resolution filesGravatar Joey Hess2012-06-27
| | |
| * | commit merge resolutionGravatar Joey Hess2012-06-27
| | | | | | | | | | | | this is necessary so the sync can continue successfully with its push phase
| * | fix file nameGravatar Joey Hess2012-06-27
| | |
* | | closeGravatar Joey Hess2012-06-27
| | |
| * | don't automerge when the symlinks cannot be parsed as keysGravatar Joey Hess2012-06-27
| | |
| * | sync: Automatically resolves merge conflicts.Gravatar Joey Hess2012-06-27
| | | | | | | | | | | | untested, but it compiles :)
| * | properly handle deleted files when processing ls-files --unmergedGravatar Joey Hess2012-06-27
|/ /
* | add ls-files --unmerged supportGravatar Joey Hess2012-06-27
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkWzAq6TusMi9zI3FLkDOETRIAUTtmGZVg2012-06-27
| |
| * Added a commentGravatar http://joeyh.name/2012-06-27
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkwR9uOA38yi5kEUvcEWNtRiZwpxXskayE2012-06-27
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus2012-06-27
| |
| * Added a commentGravatar http://joeyh.name/2012-06-27
|/
* git-config fileEncodingGravatar Joey Hess2012-06-26
| | | | | | | | | | | | Accept arbitrarily encoded repository filepaths etc when reading git config output. This fixes support for remotes with unusual characters in their names. For example, a remote with a url of /tmp/çüş was previously skipped, because the filename wasn't encoded right so it didn't think it was available. And when setting the annex-uuid of a remote named "çüş", it used to add it under a mis-encoded form of the remote's name. Both these cases now work ok in my testing.
* Got rid of the last place that did utf8 decoding.Gravatar Joey Hess2012-06-26
| | | | | Probably fixes bugs/git-annex:_Cannot_decode_byte___39____92__xfc__39__/ although I don't know how to reproduce that bug.
* Added a commentGravatar http://joeyh.name/2012-06-27
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-06-26
|\
* | Better fix for unavailable local remotesGravatar Joey Hess2012-06-26
| | | | | | | | | | | | Not including such remotes turned out to have other consequences, including annex-truselevel git config being ignored. Instead, add guards before each operation that might try to operate on such a repo.
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkWzAq6TusMi9zI3FLkDOETRIAUTtmGZVg2012-06-27
|/
* blog for the dayGravatar Joey Hess2012-06-26
|
* Avoid ugly failure mode when moving content from a local repository that is ↵Gravatar Joey Hess2012-06-26
| | | | | | | | | | | | | | | | | | | not available. Prelude.undefined error message was introduced by bb4f31a0ee496ffb83d31cc56f8827e47605d763. It seems best to filter out local repositories that cannot be accessed from the list of remotes, rather than keeping them in and making every thing that uses the list have to deal with remotes that may have an unknown location. Besides fixing the error message, this also makes unavailable local remotes' names not be shown in various messages, including in git annex status output. Also, move --to an unavailable local repository now avoids some ugly errors like "changeWorkingDirectory: does not exist".
* new bug I noticedGravatar Joey Hess2012-06-26
|
* Version build dependency on STM, and allow building without it, which ↵Gravatar Joey Hess2012-06-26
| | | | disables the watch command.
* (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmURXBzaYE1gmVc-X9eLAyDat_6rHPl6702012-06-26
|
* (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawmURXBzaYE1gmVc-X9eLAyDat_6rHPl6702012-06-26
|
* blog for the dayGravatar Joey Hess2012-06-25
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2012-06-25
|\
| * Added a commentGravatar http://joeyh.name/2012-06-25
| |
| * Added a commentGravatar http://joeyh.name/2012-06-25
| |
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus2012-06-25
| |
| * Added a commentGravatar http://joeyh.name/2012-06-25
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-05 10:13:47 +0000