Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | add a new useful thing | 2012-01-02 | |
| | |||
* | formatting | 2011-12-31 | |
| | |||
* | update | 2011-12-31 | |
| | |||
* | releasing version 3.201112313.20111231 | 2011-12-31 | |
| | |||
* | add section on syncing to the walkthrough | 2011-12-31 | |
| | |||
* | Merge branch 'master' of ssh://git-annex.branchable.com | 2011-12-31 | |
|\ | |||
| * | Added a comment | 2011-12-31 | |
| | | |||
* | | Merge branch 'autosync' | 2011-12-31 | |
|\ \ | |/ |/| | |||
* | | Added a comment | 2011-12-31 | |
| | | |||
| * | skip local remotes that are not available (ie, not mounted) | 2011-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 alias | 2011-12-31 | |
| | | |||
| * | fix comment | 2011-12-31 | |
| | | |||
| * | type alias cleanup | 2011-12-31 | |
| | | |||
| * | refactor and check for a detached HEAD | 2011-12-31 | |
| | | |||
| * | better filtering out of special remotes | 2011-12-31 | |
| | | |||
| * | never pick special remotes in --fast | 2011-12-31 | |
| | | | | | | | | even if they have the lowest cost, we cannot use them | ||
| * | remove unnecessary check | 2011-12-31 | |
| | | | | | | | | | | mergeLocal always creates the local sync branch, so no need to check that it exists later. | ||
| * | refactor | 2011-12-31 | |
| | | |||
| * | really fix check that remote needs merged | 2011-12-31 | |
| | | |||
| * | tweak | 2011-12-31 | |
| | | |||
| * | tweak | 2011-12-31 | |
| | | |||
| * | fix check that remote branch needs merged | 2011-12-31 | |
| | | |||
| * | minor cleanups | 2011-12-31 | |
| | | | | | | | | mergeFrom is never called on branches that don't exist anymore | ||
| * | avoid syncing remotes configured annex-ignore, unless explicitly specified | 2011-12-31 | |
| | | |||
* | | Added a comment: ssh://gitolite-host/repo-name is supposed to work | 2011-12-31 | |
| | | |||
* | | Added a comment: gitolite gets different paths for different urls | 2011-12-31 | |
| | | |||
| * | sync --fast: Selects some of the remotes with the lowest annex.cost and ↵ | 2011-12-30 | |
| | | | | | | | | syncs those, in addition to any specified at the command line. | ||
| * | update | 2011-12-30 | |
| | | |||
| * | Merge branch 'master' into autosync | 2011-12-30 | |
| |\ | |/ |/| | |||
* | | typo | 2011-12-30 | |
| | | |||
* | | Added a comment | 2011-12-31 | |
| | | |||
* | | Merge branch 'master' of ssh://git-annex.branchable.com | 2011-12-30 | |
|\ \ | |||
* | | | increate spec-constr-count | 2011-12-30 | |
| | | | | | | | | | | | | Was getting SpecConstr warnings on Command.Find | ||
* | | | Merge branch 'new-monad-control' | 2011-12-30 | |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: debian/changelog | ||
| | | * | add a sync page documenting sync in detail | 2011-12-30 | |
| | | | | |||
| | * | | Added a comment | 2011-12-30 | |
| | | | | |||
| | | * | improve description of sync | 2011-12-30 | |
| | | | | |||
| | | * | push when git-annex branch changed | 2011-12-30 | |
| | | | | | | | | | | | | | | | | I was too heavy-handed in optimising away pushes | ||
| | | * | automated syncing | 2011-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 remoteList | 2011-12-30 | |
| | | | | |||
| | | * | automatically create the syncbranch | 2011-12-30 | |
| | | | | |||
| | | * | refactor | 2011-12-30 | |
| | | | | |||
| | | * | refactor | 2011-12-30 | |
| | | | | |||
| | | * | check that synced/master exists before trying to use it | 2011-12-30 | |
| | | | | | | | | | | | | | | | | and a nice error message if syncing is not set up yet | ||
| | | * | check if branches are up-to-date before merging, pushing | 2011-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 wording | 2011-12-30 | |
| | | | | |||
| | * | | Added a comment | 2011-12-30 | |
| | | | | |||
| | * | | Added a comment: repo name conventions? | 2011-12-30 | |
| |/ / |/| | | |||
| | * | message cleanup | 2011-12-30 | |
| | | | |||
| | * | avoid using Git.Ref.describe except for when generating user messages | 2011-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. |