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