| Commit message (Expand) | Author | Age |
|---|
| * | add annex-ignore-command and annex-sync-command configs |  Joey Hess | 2017-08-17 |
| * | configuration to disable automatic merge conflict resolution | Joey Hess | 2017-06-01 |
| * | de-Maybe remoteGitConfig | Joey Hess | 2017-05-11 |
| * | Added remote.<name>.annex-push and remote.<name>.annex-pull | Joey Hess | 2017-04-05 |
| * | sync --content-of=path | Joey Hess | 2017-03-20 |
| * | AssociatedFile newtype | Joey Hess | 2017-03-10 |
| * | sync hack to make updateInstead work on eg FAT | Joey Hess | 2017-02-17 |
| * | make git-annex:git-annex push quiet again | Joey Hess | 2017-02-17 |
| * | sync: Improve integration with receive.denyCurrentBranch=updateInstead | Joey Hess | 2017-02-15 |
| * | forgot to compile last commit; fix mistakes | Joey Hess | 2017-02-15 |
| * | sync, merge: Fail when the current branch has no commits yet, instead of not ... | Joey Hess | 2017-02-14 |
| * | make sync --no-commit override annex.annex.autocommit | Joey Hess | 2017-02-03 |
| * | New annex.synccontent config setting | Joey Hess | 2017-02-03 |
| * | annex.autocommit can be configured via git-annex config | Joey Hess | 2017-02-03 |
| * | 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 |
Joey Hess