diff options
Diffstat (limited to 'rich0.txt')
| -rw-r--r-- | rich0.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rich0.txt b/rich0.txt index 3998d97ec43f..f6d7149801ee 100644 --- a/rich0.txt +++ b/rich0.txt @@ -10,6 +10,7 @@ 'status': 'official'} $ pmaint sync rich0 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 rich0 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: @@ -24,7 +25,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing rich0 *** synced rich0 * Sync succeeded $ git log --format=%ci -1 |