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