diff options
Diffstat (limited to 'pross.txt')
| -rw-r--r-- | pross.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pross.txt b/pross.txt index 289b210dfff8..ea7ac2edc91e 100644 --- a/pross.txt +++ b/pross.txt @@ -11,6 +11,7 @@ 'status': 'unofficial'} $ pmaint sync pross 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 pross 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 pross *** synced pross * Sync succeeded $ git log --format=%ci -1 |