summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* assistant: Deal with upcoming git's refusal to merge unrelated histories by ↵Gravatar Joey Hess2016-04-22
| | | | | | | | | | | | | default git 2.8.1 (or perhaps 2.9.0) is going to prevent git merge from merging in unrelated branches. Since the webapp's pairing etc features often combine together repositories with unrelated histories, work around this behavior change by setting GIT_MERGE_ALLOW_UNRELATED_HISTORIES when the assistant merges. Note though that this is not done for git annex sync's merges, so it will follow git's default or configured behavior.
* reinject: Added new mode which can reinject known files into the annex.Gravatar Joey Hess2016-04-22
| | | | For example: git-annex reinject --known /mnt/backup/*
* Merge remote-tracking branch 'origin/master'Gravatar Joey Hess2016-04-22
|\
* | adjusted branches need git 2.2.0 or newerGravatar Joey Hess2016-04-22
| | | | | | | | | | | | When git-annex is used with a git version older than 2.2.0, disable support for adjusted branches, since GIT_COMMON_DIR is needed to update them and was first added in that version of git.
| * Added a commentGravatar zarel2016-04-22
| |
| * rename bugs/startup_scan_extremely_slow___40__v6_repo__41__.mdwn to ↵Gravatar zarel2016-04-22
| | | | | | | | bugs/startup_scan_extremely_slow.mdwn
| * Added a commentGravatar interstar@551341a1dbca18391e90a3f719eae492868ceb7a2016-04-22
| |
| * Added a comment: objecthashlowerGravatar http://id.clacke.se/2016-04-22
| |
| * Added a comment: objecthashlowerGravatar http://id.clacke.se/2016-04-22
| |
| * Added a comment: Case-sensitive on OSXGravatar http://id.clacke.se/2016-04-22
| |
| * Added a comment: git-annex is gitGravatar http://id.clacke.se/2016-04-22
| |
| * (no commit message)Gravatar interstar@551341a1dbca18391e90a3f719eae492868ceb7a2016-04-22
| |
* | use more general moduleGravatar Joey Hess2016-04-21
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-04-21
|\
* | todoGravatar Joey Hess2016-04-21
| |
| * Added a commentGravatar pigmonkey2016-04-21
| |
* | calckey can use --backendGravatar Joey Hess2016-04-21
|/
* Added a commentGravatar cstork2016-04-21
|
* Added a commentGravatar CandyAngel2016-04-21
|
* Added a commentGravatar j_k_234@b2b1aa189bf195cefd815fc0fe70e0ebbe2b80772016-04-21
|
* Added a commentGravatar cstork2016-04-21
|
* devblogGravatar Joey Hess2016-04-20
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-04-20
|\
* | use a separate tmp dir for the test homeGravatar Joey Hess2016-04-20
| |
| * Added a commentGravatar grawity@2ea26be48562f66fcb9b66307da72b1e2e37453f2016-04-20
| |
* | a couple of tests chdir in ways that need an absolute path in the overridden ↵Gravatar Joey Hess2016-04-20
|/ | | | HOME
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-04-20
|\
* | Isolate test suite from global git config settings.Gravatar Joey Hess2016-04-20
| |
| * Added a commentGravatar spwhitton2016-04-20
|/
* Fix bug that prevented annex.sshcaching=false configuration from taking ↵Gravatar Joey Hess2016-04-20
| | | | effect when on a crippled filesystem. Thanks, divergentdave.
* commentGravatar Joey Hess2016-04-20
|
* only filter out mdwn2man warning, not other warningsGravatar Joey Hess2016-04-20
|
* commentGravatar Joey Hess2016-04-20
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-04-20
|\
* | commentGravatar Joey Hess2016-04-20
| |
| * Added a commentGravatar pigmonkey2016-04-20
|/
* commentGravatar Joey Hess2016-04-20
|
* this bug report/rant section has gotten way past diminishing returns, so I ↵Gravatar Joey Hess2016-04-20
| | | | | | | am deleting it Sorry, but I have no interest in arguing about false equivilances such as comment 23.
* parenGravatar Joey Hess2016-04-20
|
* fixed via time machineGravatar Joey Hess2016-04-20
|
* calckey: New plumbing command, calculates the key that would be used to ↵Gravatar Joey Hess2016-04-20
| | | | refer to a file
* reinject: When src file's content cannot be verified, leave it alone, ↵Gravatar Joey Hess2016-04-20
| | | | instead of deleting it.
* commentGravatar Joey Hess2016-04-20
|
* responseGravatar Joey Hess2016-04-20
|
* followupGravatar Joey Hess2016-04-20
|
* commentGravatar Joey Hess2016-04-20
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2016-04-20
|\
* | Avoid setting LOCPATH in linux standalone builds now that ghc has been fixed ↵Gravatar Joey Hess2016-04-20
| | | | | | | | to not hang when it cannot find locale files.
| * (no commit message)Gravatar pigmonkey2016-04-20
|/
* remove old closed bugs and todo items to speed up wiki updates and reduce sizeGravatar Joey Hess2016-04-19
| | | | | | | | | Remove closed bugs and todos that were last edited or commented before Q3 2015. Command line used: for f in $(grep -l '\[\[done\]\]' -- *.mdwn); do d="$(echo "$f" | sed 's/.mdwn$//')"; if [ -z "$(git log --since=09-09-2015 --pretty=oneline -- "$f")" -a -z "$(git log --since=09-09-2015 --pretty=oneline -- "$d")" ]; then git rm -- "$f"; git rm -rf "$d"; fi; done for f in $(grep -l '|done\]\]' -- *.mdwn); do d="$(echo "$f" | sed 's/.mdwn$//')"; if [ -z "$(git log --since=09-09-2015 --pretty=oneline -- "$f")" -a -z "$(git log --since=09-09-2015 --pretty=oneline -- "$d")" ]; then git rm -- "$f"; git rm -rf "$d"; fi; done
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-09 11:41:52 +0000