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