diff options
Diffstat (limited to 'waffle-builds.txt')
| -rw-r--r-- | waffle-builds.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/waffle-builds.txt b/waffle-builds.txt index 55715ed4d61e..ec11fcba94f9 100644 --- a/waffle-builds.txt +++ b/waffle-builds.txt @@ -11,9 +11,21 @@ {'type': 'git', 'uri': 'git+ssh://git@github.com/FlyingWaffleDev/waffle-builds.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync waffle-builds -Cloning into '/var/lib/repo-mirror-ci/sync/waffle-builds'... +warning: Pulling without specifying how to reconcile divergent branches is +discouraged. You can squelch this message by running one of the following +commands sometime before your next pull: + + git config pull.rebase false # merge (the default strategy) + git config pull.rebase true # rebase + git config pull.ff only # fast-forward only + +You can replace "git config" with "git config --global" to set a default +preference for all repositories. You can also pass --rebase, --no-rebase, +or --ff-only on the command line to override the configured default per +invocation. + +Already up to date. *** syncing waffle-builds *** synced waffle-builds * Sync succeeded |