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