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