| Commit message (Expand) | Author | Age |
* | improve comment | Joey Hess | 2016-11-16 |
* | Avoid backtraces on expected failures when built with ghc 8; only use backtra... | Joey Hess | 2016-11-15 |
* | sync: Pass --allow-unrelated-histories to git merge when used with git git 2.... | Joey Hess | 2016-11-15 |
* | fix bugs in handing of deep branches with sync and adjusted branches | Joey Hess | 2016-09-21 |
* | use keyLocations not loggedLocations | Joey Hess | 2016-09-06 |
* | --branch, stage 2 | Joey Hess | 2016-07-20 |
* | --branch, stage 1 | Joey Hess | 2016-07-20 |
* | sync --content: Fix bug that caused transfers of files to be made to a git r... | Joey Hess | 2016-06-02 |
* | refactor | Joey Hess | 2016-04-22 |
* | assistant: Deal with upcoming git's refusal to merge unrelated histories by d... | Joey Hess | 2016-04-22 |
* | add AdjBranch newtype; some simplications | Joey Hess | 2016-04-09 |
* | run out of tree merge with --no-ff | Joey Hess | 2016-04-06 |
* | fix auto merge conflict resolution when doing out of tree merge for adjusted ... | Joey Hess | 2016-04-06 |
* | sync: Show output of git commit. | Joey Hess | 2016-04-05 |
* | fixed merging of changes from adjusted branch + a remote | Joey Hess | 2016-03-31 |
* | made some progress on syncing adjusted branches, but still buggy | Joey Hess | 2016-03-31 |
* | Merge branch 'master' into adjustedbranch | Joey Hess | 2016-03-11 |
|\ |
|
| * | remove redundant start message | Joey Hess | 2016-03-09 |
* | | working toward adjusted commit propigation | Joey Hess | 2016-03-03 |
* | | push original branch, not adjusted branch | Joey Hess | 2016-03-03 |
* | | fix bug introduced in recent commit | Joey Hess | 2016-02-29 |
* | | update sync branch to the orig branch when in adjusted branch | Joey Hess | 2016-02-29 |
* | | make assistant aware of adjusted branches when merging | Joey Hess | 2016-02-29 |
* | | make sync aware of adjusted branches | Joey Hess | 2016-02-29 |
|/ |
|
* | remove 163 lines of code without changing anything except imports | Joey Hess | 2016-01-20 |
* | arrange for regional output manager to run when -J is enabled | Joey Hess | 2015-11-04 |
* | improve layout and comment | Joey Hess | 2015-10-15 |
* | add VerifiedCopy data type | Joey Hess | 2015-10-08 |
* | Do verification of checksums of annex objects downloaded from remotes. | Joey Hess | 2015-10-01 |
* | Improve bash completion, so it completes names of remotes and backends in app... | Joey Hess | 2015-09-14 |
* | sync: Add --no-commit, --no-pull, --no-push options to turn off parts of the ... | Joey Hess | 2015-09-13 |
* | make sync --no-content be accepted | Joey Hess | 2015-08-20 |
* | sync: Support --jobs | Joey Hess | 2015-08-14 |
* | Simplify setup process for a ssh remote. | Joey Hess | 2015-08-05 |
* | sync --content: Fix bug that caused files to be uploaded to eg, more archive ... | Joey Hess | 2015-07-20 |
* | wip | Joey Hess | 2015-07-09 |
* | convert all commands to work with optparse-applicative | Joey Hess | 2015-07-08 |
* | display cmdparamdesc in optparse-applicative usage messages | Joey Hess | 2015-07-08 |
* | started converting to use optparse-applicative | Joey Hess | 2015-07-08 |
* | sync: When annex.autocommit=false, avoid making any commit of local changes, ... | Joey Hess | 2015-07-07 |
* | merge: Avoid creating the synced/master branch. | Joey Hess | 2015-07-07 |
* | move comment | Joey Hess | 2015-06-16 |
* | avoid building unused bloomfilter when run without --all | Joey Hess | 2015-06-16 |
* | on second thought, sync --content --unused is probably not useful, remove | Joey Hess | 2015-06-16 |
* | use bloom filter in second pass of sync --all --content | Joey Hess | 2015-06-16 |
* | Increased the default annex.bloomaccuracy from 1000 to 10000000 | Joey Hess | 2015-06-16 |
* | sync: Add support for --all and --unused. | Joey Hess | 2015-06-16 |
* | switch code to using associated files | Joey Hess | 2015-06-16 |
* | get, move, copy, mirror: Concurrent downloads and uploads are now supported! | Joey Hess | 2015-04-10 |
* | sync: Fix committing when in a direct mode repo that has no HEAD ref. | Joey Hess | 2015-03-04 |