summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* note on niceGravatar Joey Hess2013-10-17
|
* try working around windows xargs problemGravatar Joey Hess2013-10-17
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-10-17
|\
* | update for DiffTree type change (which fixes assistant in subdir confusion bug)Gravatar Joey Hess2013-10-17
| |
* | update for DiffTree type changeGravatar Joey Hess2013-10-17
| | | | | | | | Experimentally, using the raw TopFilePath was right here.
* | update for DiffTree changeGravatar Joey Hess2013-10-17
| | | | | | | | | | | | | | | | | | This actually fixes a bug; if pre-commit was run in a subdir, it would pass relative files when updating the associated file maps, and so the maps wouldn't update. I don't think this bug happened in practice, due to the way pre-commit is called by the hook. It happened to chdir to the top of the work tree.
* | update for LsTree type changeGravatar Joey Hess2013-10-17
| | | | | | | | in the config monitor, we want files relative to the top of the working directory
* | use TopFilePath for DiffTree and LsTreeGravatar Joey Hess2013-10-17
| |
* | updateGravatar Joey Hess2013-10-17
| |
* | repro recipeGravatar Joey Hess2013-10-17
| |
* | sync: fix crash on first sync when no branch exists yetGravatar Joey Hess2013-10-17
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg2013-10-17
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkGCmVc5qIJaQQgG82Hc5zzBdAVdhe2JEM2013-10-16
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-10-16
|\
* | mini-devblogGravatar Joey Hess2013-10-16
| |
* | moreinfoGravatar Joey Hess2013-10-16
| |
| * Added a commentGravatar http://joeyh.name/2013-10-16
| |
| * Added a commentGravatar http://joeyh.name/2013-10-16
|/
* S3: Try to ensure bucket name is valid for archive.org.Gravatar Joey Hess2013-10-16
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-10-16
|\
* | test suite found a case that was not properly parsedGravatar Joey Hess2013-10-16
| |
* | closeGravatar Joey Hess2013-10-16
| |
* | test case for a40e203f23a87bbc6d362d33734f1e4dcf645871Gravatar Joey Hess2013-10-16
| |
* | fix indirect mode conflict merge when only one side is annexed fileGravatar Joey Hess2013-10-16
| | | | | | | | | | git-merge's creation of file~HEAD type files did not make this especially nice to do.
* | ensure merge directory is empty before starting mergeGravatar Joey Hess2013-10-16
| | | | | | | | Don't want some past failed merge to lead to bad results, potentially.
* | sync: Fix automatic resolution of merge conflicts where one side is an ↵Gravatar Joey Hess2013-10-16
| | | | | | | | | | | | | | | | | | annexed file, and the other side is a non-annexed file, or a directory. Note that this case is only fully automatically resolved in direct mode. In indirect mode, git merge moves the file to file~HEAD, and replaces it with the directory, and leaves the file in unmerged state, and sync doesn't yet change that.
| * Added a commentGravatar http://joeyh.name/2013-10-16
| |
* | sheeshGravatar Joey Hess2013-10-16
| |
| * Added a commentGravatar http://joeyh.name/2013-10-16
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-10-16
|\
* | tighten file2key to not produce invalid keys with no keyNameGravatar Joey Hess2013-10-16
| | | | | | | | | | | | A file named "foo-" or "foo-bar" was taken as a key's file, with a backend of "foo", and an empty keyName. This led to various problems, especially because converting that key back to a file did not yeild the same filename.
| * Added a comment: adding ssh serverGravatar https://www.google.com/accounts/o8/id?id=AItOawmK0703vNSIQsP1mGf-4MAPnsBZiSc6yVo2013-10-16
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-10-16
|\
* | move another bug report out of forumGravatar Joey Hess2013-10-16
| |
| * Added a commentGravatar http://joeyh.name/2013-10-16
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-10-16
|\
* | fix off-by-oneGravatar Joey Hess2013-10-16
| |
| * Added a commentGravatar http://joeyh.name/2013-10-16
| |
| * Added a commentGravatar http://joeyh.name/2013-10-16
|/
* Added a commentGravatar http://joeyh.name/2013-10-16
|
* Added a commentGravatar http://joeyh.name/2013-10-16
|
* fix inclusion of -gitrevGravatar Joey Hess2013-10-16
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2013-10-16
|\
* | Work around sed output difference that led to version containing a newline ↵Gravatar Joey Hess2013-10-16
| | | | | | | | on OSX.
| * Added a comment: Re: comment 10Gravatar fmarier2013-10-16
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawkdiXn5s1wX2Zncy1S7_h-yPTv2gt0bmmY2013-10-16
| |
| * removedGravatar https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U2013-10-16
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U2013-10-16
| |
| * Added a commentGravatar https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U2013-10-16
| |
| * (no commit message)Gravatar orb2013-10-16
| |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-10 06:36:44 +0000