diff options
Diffstat (limited to 'konsolebox.txt')
| -rw-r--r-- | konsolebox.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/konsolebox.txt b/konsolebox.txt index df1ce988d2ca..b8c6afd07977 100644 --- a/konsolebox.txt +++ b/konsolebox.txt @@ -10,8 +10,8 @@ 'uri': 'https://github.com/konsolebox/overlay.git'}], 'status': 'unofficial'} $ pmaint sync konsolebox -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 konsolebox 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: @@ -26,7 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing konsolebox *** synced konsolebox * Sync succeeded $ git log --format=%ci -1 |