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