aboutsummaryrefslogtreecommitdiff
path: root/Command/Sync.hs
Commit message (Expand)AuthorAge
* fix sync bug in direct modeGravatar Joey Hess2018-02-26
* finally really add back custom-setup stanzaGravatar Joey Hess2017-12-31
* showStart variant for when there's no worktree fileGravatar Joey Hess2017-11-28
* better dup key with -J fixGravatar Joey Hess2017-10-17
* Avoid repeated checking that files passed on the command line exist.Gravatar Joey Hess2017-10-16
* sync: Added --cleanup, which removes local and remote synced/ branches.Gravatar Joey Hess2017-09-28
* add exporter thread to assistantGravatar Joey Hess2017-09-20
* git annex sync --content to exportsGravatar Joey Hess2017-09-19
* add annex-ignore-command and annex-sync-command configsGravatar Joey Hess2017-08-17
* configuration to disable automatic merge conflict resolutionGravatar Joey Hess2017-06-01
* de-Maybe remoteGitConfigGravatar Joey Hess2017-05-11
* Added remote.<name>.annex-push and remote.<name>.annex-pullGravatar Joey Hess2017-04-05
* sync --content-of=pathGravatar Joey Hess2017-03-20
* AssociatedFile newtypeGravatar Joey Hess2017-03-10
* sync hack to make updateInstead work on eg FATGravatar Joey Hess2017-02-17
* make git-annex:git-annex push quiet againGravatar Joey Hess2017-02-17
* sync: Improve integration with receive.denyCurrentBranch=updateInsteadGravatar Joey Hess2017-02-15
* forgot to compile last commit; fix mistakesGravatar Joey Hess2017-02-15
* sync, merge: Fail when the current branch has no commits yet, instead of not ...Gravatar Joey Hess2017-02-14
* make sync --no-commit override annex.annex.autocommitGravatar Joey Hess2017-02-03
* New annex.synccontent config settingGravatar Joey Hess2017-02-03
* annex.autocommit can be configured via git-annex configGravatar Joey Hess2017-02-03
* improve commentGravatar Joey Hess2016-11-16
* Avoid backtraces on expected failures when built with ghc 8; only use backtra...Gravatar Joey Hess2016-11-15
* sync: Pass --allow-unrelated-histories to git merge when used with git git 2....Gravatar Joey Hess2016-11-15
* fix bugs in handing of deep branches with sync and adjusted branchesGravatar Joey Hess2016-09-21
* use keyLocations not loggedLocationsGravatar Joey Hess2016-09-06
* --branch, stage 2Gravatar Joey Hess2016-07-20
* --branch, stage 1Gravatar Joey Hess2016-07-20
* sync --content: Fix bug that caused transfers of files to be made to a git r...Gravatar Joey Hess2016-06-02
* refactorGravatar Joey Hess2016-04-22
* assistant: Deal with upcoming git's refusal to merge unrelated histories by d...Gravatar Joey Hess2016-04-22
* add AdjBranch newtype; some simplicationsGravatar Joey Hess2016-04-09
* run out of tree merge with --no-ffGravatar Joey Hess2016-04-06
* fix auto merge conflict resolution when doing out of tree merge for adjusted ...Gravatar Joey Hess2016-04-06
* sync: Show output of git commit.Gravatar Joey Hess2016-04-05
* fixed merging of changes from adjusted branch + a remoteGravatar Joey Hess2016-03-31
* made some progress on syncing adjusted branches, but still buggyGravatar Joey Hess2016-03-31
* Merge branch 'master' into adjustedbranchGravatar Joey Hess2016-03-11
|\
| * remove redundant start messageGravatar Joey Hess2016-03-09
* | working toward adjusted commit propigationGravatar Joey Hess2016-03-03
* | push original branch, not adjusted branchGravatar Joey Hess2016-03-03
* | fix bug introduced in recent commitGravatar Joey Hess2016-02-29
* | update sync branch to the orig branch when in adjusted branchGravatar Joey Hess2016-02-29
* | make assistant aware of adjusted branches when mergingGravatar Joey Hess2016-02-29
* | make sync aware of adjusted branchesGravatar Joey Hess2016-02-29
|/
* remove 163 lines of code without changing anything except importsGravatar Joey Hess2016-01-20
* arrange for regional output manager to run when -J is enabledGravatar Joey Hess2015-11-04
* improve layout and commentGravatar Joey Hess2015-10-15
* add VerifiedCopy data typeGravatar Joey Hess2015-10-08
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-19 18:52:15 +0000