summaryrefslogtreecommitdiff
path: root/Command/Sync.hs
Commit message (Expand)AuthorAge
* sync: Fix committing when in a direct mode repo that has no HEAD ref.Gravatar Joey Hess2015-03-04
* fix innaccurate commentGravatar Joey Hess2015-03-04
* sync: As well as the synced/git-annex push, attempt a git-annex:git-annex pus...Gravatar Joey Hess2015-02-27
* propigate ssh-options everywhere ssh caching is usedGravatar Joey Hess2015-02-12
* sync, assistant: Include repository name in head branch commit message.Gravatar Joey Hess2015-02-11
* update my email address and homepage urlGravatar Joey Hess2015-01-21
* devblogGravatar Joey Hess2015-01-13
* handle sync's use of setCurrentDirectory to work with relative pathsGravatar Joey Hess2015-01-06
* sync: Fix an edge case where syncing in a bare repository would try to merge ...Gravatar Joey Hess2015-01-05
* sync: Now supports remote groups, the same way git remote update does.Gravatar Joey Hess2014-12-29
* doh't use "def" for command definitions, it conflicts with Data.Default.defGravatar Joey Hess2014-10-14
* fix some mixed space+tab indentationGravatar Joey Hess2014-10-09
* sync: Ensure that pending changes to git-annex branch are committed when in d...Gravatar Joey Hess2014-09-11
* support commit.gpgsignGravatar Joey Hess2014-07-04
* assistant: Fix one-way assistant->assistant sync in direct mode.Gravatar Joey Hess2014-06-16
* replace (Key, Backend) with KeyGravatar Joey Hess2014-04-17
* sync, assistant, remotedaemon: Use ssh connection caching for git pushes and ...Gravatar Joey Hess2014-04-12
* copy --fast --to remote: Avoid printing anything for files that are already b...Gravatar Joey Hess2014-03-13
* sync: Automatically resolve merge conflict between and annexed file and a reg...Gravatar Joey Hess2014-03-04
* factor out Annex.AutoMerge from Command.SyncGravatar Joey Hess2014-03-04
* improved direct mode dir/file conflicted merge resultion, using tree graftingGravatar Joey Hess2014-03-04
* much improved test and real fix for FAT symlink loss on conflicted mergeGravatar Joey Hess2014-03-04
* finish fixing direct mode merge bug involving unstaged local filesGravatar Joey Hess2014-03-04
* rename for clarityGravatar Joey Hess2014-03-03
* simplfyGravatar Joey Hess2014-03-03
* sync: Fix bug in direct mode that caused a file not checked into git to be de...Gravatar Joey Hess2014-03-03
* pre-commit-annex hook script to automatically extract metadata from lots of t...Gravatar Joey Hess2014-03-02
* remove Read instance for RefGravatar Joey Hess2014-02-19
* hlint to give autobuilder something to doGravatar Joey Hess2014-02-11
* add test case & fix conflict resolution bug on Windows & FATGravatar Joey Hess2014-02-04
* sync --content: Drop files from remotes that don't have them after getting them.Gravatar Joey Hess2014-02-02
* update function name in commentGravatar Joey Hess2014-02-02
* sync --content: Reuse smart copy code from copy command, including handling a...Gravatar Joey Hess2014-02-02
* remove some monkey facesGravatar Joey Hess2014-02-01
* sync --content: Re-pull from remotes after downloading content, since that ca...Gravatar Joey Hess2014-02-01
* improve sync with xmpp and annex-ignoreGravatar Joey Hess2014-02-01
* avoid using function named that conflicts with name used in newer version of ...Gravatar Joey Hess2014-01-29
* reorganize some files and importsGravatar Joey Hess2014-01-26
* fix transfers of key with no associated fileGravatar Joey Hess2014-01-23
* much better command action handling for sync --contentGravatar Joey Hess2014-01-20
* fix inversion of control in CommandSeek (no behavior changes)Gravatar Joey Hess2014-01-20
* include information about remotes just uloaded to when calling handleDropsFromGravatar Joey Hess2014-01-19
* sync --content: New option that makes the content of annexed files be transfe...Gravatar Joey Hess2014-01-19
* Remotes can now be made read-only, by setting remote.<name>.annex-readonlyGravatar Joey Hess2014-01-02
* Avoid using git commit in direct mode, since in some situations it will read ...Gravatar Joey Hess2013-12-01
* on second thought, don't change sync to exit nonzero on successful conflicted...Gravatar Joey Hess2013-11-14
* add a note after successful conflicted merge resolutionGravatar Joey Hess2013-11-14
* sync: When there are merge conflicts that get automatically resolved, exit no...Gravatar Joey Hess2013-11-07
* work around lack of receive.denyCurrentBranch in direct modeGravatar Joey Hess2013-11-05
* sync: Work even when the local git repository is new and empty, with no maste...Gravatar Joey Hess2013-11-02