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