aboutsummaryrefslogtreecommitdiff
path: root/Command/Sync.hs
Commit message (Expand)AuthorAge
* 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
* use a long note hereGravatar Joey Hess2013-11-01
* sync: print a hint about receive.denyNonFastForwards when a push failsGravatar Joey Hess2013-10-26
* sync: fix crash on first sync when no branch exists yetGravatar Joey Hess2013-10-17
* fix indirect mode conflict merge when only one side is annexed fileGravatar Joey Hess2013-10-16
* sync: Fix automatic resolution of merge conflicts where one side is an annexe...Gravatar Joey Hess2013-10-16
* hlintGravatar Joey Hess2013-09-25
* more completely solve catKey memory leakGravatar Joey Hess2013-09-19
* sync: Don't fail if the directory it is run in gets removed by the sync.Gravatar Joey Hess2013-09-13
* sync: support gcrypt4.20130909Gravatar Joey Hess2013-09-09
* sync, assistant: Force push of the git-annex branch.Gravatar Joey Hess2013-08-29
* sync, merge: Bug fix: Don't try to merge into master when in a bare repo.Gravatar Joey Hess2013-08-17
* sync: Better support for bare git remotes. Now pushes directly to the master ...Gravatar Joey Hess2013-06-12
* fix merge conflict resolution when both sides have the same keyGravatar Joey Hess2013-05-26
* correct recent fixGravatar Joey Hess2013-05-26
* sync: Fix double merge conflict resolution handling.Gravatar Joey Hess2013-05-26
* fuzz test discovered a way automatic merge resultion can fail; fixGravatar Joey Hess2013-05-25
* sync: Commit in direct mode even if no changes were stagedGravatar Joey Hess2013-04-23