diff options
Diffstat (limited to 'klondike.txt')
| -rw-r--r-- | klondike.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/klondike.txt b/klondike.txt index 8d3f8fb4841f..9cb20a70f95d 100644 --- a/klondike.txt +++ b/klondike.txt @@ -15,8 +15,8 @@ 'uri': 'git+ssh://git@git.gentoo.org/user/klondike.git'}], 'status': 'unofficial'} $ pmaint sync klondike -WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). WARNING:pkgcore:hexedit-overlay repo at '/var/lib/repo-mirror-ci/sync/hexedit-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). +*** syncing klondike 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: @@ -31,7 +31,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing klondike *** synced klondike * Sync succeeded $ git log --format=%ci -1 |