Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' into autosync | Joey Hess | 2011-12-30 |
|\ | |||
| * | typo | Joey Hess | 2011-12-30 |
| | | |||
| * | Added a comment | http://joey.kitenet.net/ | 2011-12-31 |
| | | |||
| * | Merge branch 'master' of ssh://git-annex.branchable.com | Joey Hess | 2011-12-30 |
| |\ | |||
| * | | increate spec-constr-count | Joey Hess | 2011-12-30 |
| | | | | | | | | | | | | Was getting SpecConstr warnings on Command.Find | ||
| * | | Merge branch 'new-monad-control' | Joey Hess | 2011-12-30 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: debian/changelog | ||
* | | | | add a sync page documenting sync in detail | Joey Hess | 2011-12-30 |
| | | | | |||
| | | * | Added a comment | http://joey.kitenet.net/ | 2011-12-30 |
| | | | | |||
* | | | | improve description of sync | Joey Hess | 2011-12-30 |
| | | | | |||
* | | | | push when git-annex branch changed | Joey Hess | 2011-12-30 |
| | | | | | | | | | | | | | | | | I was too heavy-handed in optimising away pushes | ||
* | | | | automated syncing | Joey Hess | 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 | Joey Hess | 2011-12-30 |
| | | | | |||
* | | | | automatically create the syncbranch | Joey Hess | 2011-12-30 |
| | | | | |||
* | | | | refactor | Joey Hess | 2011-12-30 |
| | | | | |||
* | | | | refactor | Joey Hess | 2011-12-30 |
| | | | | |||
* | | | | check that synced/master exists before trying to use it | Joey Hess | 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 | Joey Hess | 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 | Joey Hess | 2011-12-30 |
| | | | | |||
| | | * | Added a comment | http://joey.kitenet.net/ | 2011-12-30 |
| | | | | |||
| | | * | Added a comment: repo name conventions? | bremner | 2011-12-30 |
| | |/ | |/| | |||
* | | | message cleanup | Joey Hess | 2011-12-30 |
| | | | |||
* | | | avoid using Git.Ref.describe except for when generating user messages | Joey Hess | 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. | ||
* | | | add base, under | Joey Hess | 2011-12-30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The describe function was only intended to generate a human-visible description of a branch, but taking the base of a branch is a useful operation to be able to do no matter the human-visible representation. Converting a branch like refs/heads/master to refs/heads/origin/master is also a useful operation, and under can do that. | ||
* | | | update to my indentation style | Joey Hess | 2011-12-30 |
| | | | |||
* | | | force git-annex branch update after fetching remotes | Joey Hess | 2011-12-30 |
| | | | | | | | | | | | | | | | | | | | | | | | | git-annex normally only runs the branch update once per run, for speed, but since this fetches new remote git-annex tracking branches, they need to be merged in after that fetch. An earlier call to Remote.byName was causing the update to run before the fetch sometimes, but it could have been anything. Just force the update to happen in the right place. | ||
* | | | add forceUpdate | Joey Hess | 2011-12-30 |
| | | | | | | | | | | | | | | | This code is picked from my tweak-fetch branch, which already did the needed refactoring. | ||
* | | | Merge remote-tracking branch 'nomeata/master' into sync | Joey Hess | 2011-12-30 |
|\ \ \ | |/ / |/| | | |||
* | | | fixed behavior when multiple insteadOf configs are provided for the same url ↵ | Joey Hess | 2011-12-30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | base Consider this git config --list case: url.git+ssh://git@example.com/.insteadOf=gl url.git+ssh://git@example.com/.insteadOf=shared Since config is stored in a Map, only the last of the values for this key was stored and available for use by the insteadOf code. But that is wrong; git allows either "gl" or "shared" to be used in an url and the insteadOf value to be substituted in. To support this, it seems best to keep the existing config map as-is, and add a second map that accumulates a list of multiple values for config keys. This new fullconfig map can be used in the rare places where multiple values for a key make sense, without needing to complicate everything else. Haskell's laziness and data sharing keep the overhead of adding this second map low. | ||
* | | | Added a comment: Finally some code | http://www.joachim-breitner.de/ | 2011-12-29 |
| | | | |||
| * | | By default, sync with all remotes having the synced/ branch | Joachim Breitner | 2011-12-29 |
| | | | |||
| * | | Implement branch-syncing in Command.Sync | Joachim Breitner | 2011-12-29 |
| | | | | | | | | | | | | | | | as described in the previous commit to the documentation. The loggin UI is not great yet. | ||
| * | | Outline extended git annex sync semantics in the documentation | Joachim Breitner | 2011-12-27 |
| | | | |||
* | | | Added a comment: git tweak-fetch | http://joey.kitenet.net/ | 2011-12-26 |
| | | | |||
| | * | Updated to build with monad-control 0.3. | Joey Hess | 2011-12-24 |
| | | | |||
| | * | Merge branch 'new-monad-control' | Joey Hess | 2011-12-24 |
| | |\ | |||
* | | | | (no commit message) | http://www.openid.albertlash.com/openid/ | 2011-12-25 |
| | | | | |||
* | | | | (no commit message) | http://www.openid.albertlash.com/openid/ | 2011-12-24 |
| |/ / |/| | | |||
* | | | fix typo | Joey Hess | 2011-12-24 |
| | | | |||
* | | | slightly improve typography | Joey Hess | 2011-12-24 |
| | | | |||
* | | | Added a comment | http://joey.kitenet.net/ | 2011-12-24 |
| | | | |||
* | | | Added a comment | http://joey.kitenet.net/ | 2011-12-24 |
|/ / | |||
* | | Added a comment | http://www.joachim-breitner.de/ | 2011-12-24 |
| | | |||
* | | Added a comment | http://www.joachim-breitner.de/ | 2011-12-24 |
| | | |||
* | | Added a comment | http://www.openid.albertlash.com/openid/ | 2011-12-24 |
| | | |||
* | | Added a comment: Any update on this? | http://adamspiers.myopenid.com/ | 2011-12-24 |
| | | |||
* | | (no commit message) | http://adamspiers.myopenid.com/ | 2011-12-24 |
| | | |||
* | | (no commit message) | http://adamspiers.myopenid.com/ | 2011-12-24 |
| | | |||
* | | add a page for openSUSE install instructions | http://adamspiers.myopenid.com/ | 2011-12-24 |
| | | |||
* | | Added a comment | https://www.google.com/accounts/o8/id?id=AItOawmKPMUX0YHBjE93eBsEnacwZsddSDue3PY | 2011-12-23 |
| | | |||
* | | Added a comment | http://joey.kitenet.net/ | 2011-12-23 |
| | |