diff options
Diffstat (limited to 'dilfridge.txt')
| -rw-r--r-- | dilfridge.txt | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/dilfridge.txt b/dilfridge.txt index 4fb89f665dfa..36d14a625c1d 100644 --- a/dilfridge.txt +++ b/dilfridge.txt @@ -16,6 +16,19 @@ 'status': 'official'} $ pmaint sync dilfridge WARNING:pkgcore:chaoslab repo at '/var/lib/repo-mirror-ci/sync/chaoslab', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). +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 dilfridge *** synced dilfridge |