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