diff options
Diffstat (limited to 'johnmh.txt')
| -rw-r--r-- | johnmh.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/johnmh.txt b/johnmh.txt index f7169763eee2..ecec0b5b0786 100644 --- a/johnmh.txt +++ b/johnmh.txt @@ -13,8 +13,8 @@ 'uri': 'git+ssh://git@git.gentoo.org/repo/user/johnmh.git'}], 'status': 'unofficial'} $ pmaint sync johnmh -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 johnmh 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: @@ -29,7 +29,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing johnmh *** synced johnmh * Sync succeeded $ git log --format=%ci -1 |