diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-03-16 17:50:50 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-03-16 17:50:50 +0000 |
| commit | 35d8c44244b81d318bb52b9a3984864cd593902f (patch) | |
| tree | 9425dfee3fdabc1394d77fd8a6c05bbd0e439731 /junkdrawer.txt | |
| parent | 2021-03-16T17:15:01Z (diff) | |
| download | repos-35d8c44244b81d318bb52b9a3984864cd593902f.tar.gz repos-35d8c44244b81d318bb52b9a3984864cd593902f.tar.bz2 repos-35d8c44244b81d318bb52b9a3984864cd593902f.zip | |
2021-03-16T17:45:01Z
Diffstat (limited to 'junkdrawer.txt')
| -rw-r--r-- | junkdrawer.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/junkdrawer.txt b/junkdrawer.txt index 614cbe24db40..12276a7fe2cf 100644 --- a/junkdrawer.txt +++ b/junkdrawer.txt @@ -11,6 +11,7 @@ 'status': 'unofficial'} $ pmaint sync junkdrawer 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 junkdrawer 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 +26,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing junkdrawer *** synced junkdrawer * Sync succeeded $ git log --format=%ci -1 |