summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* add a new useful thingGravatar Joey Hess2012-01-02
|
* formattingGravatar Joey Hess2011-12-31
|
* updateGravatar Joey Hess2011-12-31
|
* releasing version 3.201112313.20111231Gravatar Joey Hess2011-12-31
|
* add section on syncing to the walkthroughGravatar Joey Hess2011-12-31
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2011-12-31
|\
| * Added a commentGravatar http://joey.kitenet.net/2011-12-31
| |
* | Merge branch 'autosync'Gravatar Joey Hess2011-12-31
|\ \ | |/ |/|
* | Added a commentGravatar http://joey.kitenet.net/2011-12-31
| |
| * skip local remotes that are not available (ie, not mounted)Gravatar Joey Hess2011-12-31
| | | | | | | | | | | | | | With --fast, unavailable local remotes are filtered out of the fast set. This way, if there are local remotes, --fast always acts only on them, and if none are mounted, acts on nothing. This consistency is better than --fast acting on different remotes depending on what's mounted.
| * type aliasGravatar Joey Hess2011-12-31
| |
| * fix commentGravatar Joey Hess2011-12-31
| |
| * type alias cleanupGravatar Joey Hess2011-12-31
| |
| * refactor and check for a detached HEADGravatar Joey Hess2011-12-31
| |
| * better filtering out of special remotesGravatar Joey Hess2011-12-31
| |
| * never pick special remotes in --fastGravatar Joey Hess2011-12-31
| | | | | | | | even if they have the lowest cost, we cannot use them
| * remove unnecessary checkGravatar Joey Hess2011-12-31
| | | | | | | | | | mergeLocal always creates the local sync branch, so no need to check that it exists later.
| * refactorGravatar Joey Hess2011-12-31
| |
| * really fix check that remote needs mergedGravatar Joey Hess2011-12-31
| |
| * tweakGravatar Joey Hess2011-12-31
| |
| * tweakGravatar Joey Hess2011-12-31
| |
| * fix check that remote branch needs mergedGravatar Joey Hess2011-12-31
| |
| * minor cleanupsGravatar Joey Hess2011-12-31
| | | | | | | | mergeFrom is never called on branches that don't exist anymore
| * avoid syncing remotes configured annex-ignore, unless explicitly specifiedGravatar Joey Hess2011-12-31
| |
* | Added a comment: ssh://gitolite-host/repo-name is supposed to workGravatar bremner2011-12-31
| |
* | Added a comment: gitolite gets different paths for different urlsGravatar bremner2011-12-31
| |
| * sync --fast: Selects some of the remotes with the lowest annex.cost and ↵Gravatar Joey Hess2011-12-30
| | | | | | | | syncs those, in addition to any specified at the command line.
| * updateGravatar Joey Hess2011-12-30
| |
| * Merge branch 'master' into autosyncGravatar Joey Hess2011-12-30
| |\ | |/ |/|
* | typoGravatar Joey Hess2011-12-30
| |
* | Added a commentGravatar http://joey.kitenet.net/2011-12-31
| |
* | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2011-12-30
|\ \
* | | increate spec-constr-countGravatar Joey Hess2011-12-30
| | | | | | | | | | | | Was getting SpecConstr warnings on Command.Find
* | | Merge branch 'new-monad-control'Gravatar Joey Hess2011-12-30
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: debian/changelog
| | | * add a sync page documenting sync in detailGravatar Joey Hess2011-12-30
| | | |
| | * | Added a commentGravatar http://joey.kitenet.net/2011-12-30
| | | |
| | | * improve description of syncGravatar Joey Hess2011-12-30
| | | |
| | | * push when git-annex branch changedGravatar Joey Hess2011-12-30
| | | | | | | | | | | | | | | | I was too heavy-handed in optimising away pushes
| | | * automated syncingGravatar Joey Hess2011-12-30
| | | | | | | | | | | | | | | | | | | | | | | | Some changes to make automated syncing nicer. Merge from both the remote's $branch and its synced/$branch; either could have new changes. Create synced/$branch on the remote when pushing.
| | | * export remoteListGravatar Joey Hess2011-12-30
| | | |
| | | * automatically create the syncbranchGravatar Joey Hess2011-12-30
| | | |
| | | * refactorGravatar Joey Hess2011-12-30
| | | |
| | | * refactorGravatar Joey Hess2011-12-30
| | | |
| | | * check that synced/master exists before trying to use itGravatar Joey Hess2011-12-30
| | | | | | | | | | | | | | | | and a nice error message if syncing is not set up yet
| | | * check if branches are up-to-date before merging, pushingGravatar Joey Hess2011-12-30
| | | | | | | | | | | | | | | | | | | | | | | | This optimises away the need to run anything in some common cases. It's particularly useful on push; no need to push if the tracking branch we just pulled is the same as the branch we're going to push.
| | | * improve wordingGravatar Joey Hess2011-12-30
| | | |
| | * | Added a commentGravatar http://joey.kitenet.net/2011-12-30
| | | |
| | * | Added a comment: repo name conventions?Gravatar bremner2011-12-30
| |/ / |/| |
| | * message cleanupGravatar Joey Hess2011-12-30
| | |
| | * avoid using Git.Ref.describe except for when generating user messagesGravatar Joey Hess2011-12-30
| | | | | | | | | | | | | | | | | | | | | | | | The other uses of it can all be simplified using Git.Ref.base, Git.Ref.under, and show. In some cases, describe was being used to shorten the branch name unnecessarily, and I instead pass the fully qualified name to git.