diff options
Diffstat (limited to 'dm9pZCAq.txt')
| -rw-r--r-- | dm9pZCAq.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/dm9pZCAq.txt b/dm9pZCAq.txt index b02fd30bee52..b85dea105b51 100644 --- a/dm9pZCAq.txt +++ b/dm9pZCAq.txt @@ -7,10 +7,22 @@ 'source': [{'type': 'git', 'uri': 'https://notabug.org/dm9pZCAq/dm9pZCAq-overlay.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync dm9pZCAq WARNING:pkgcore:cynede repo at '/var/lib/repo-mirror-ci/sync/cynede', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -Cloning into '/var/lib/repo-mirror-ci/sync/dm9pZCAq'... +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 dm9pZCAq *** synced dm9pZCAq * Sync succeeded |