summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'ulm.txt')
-rw-r--r--ulm.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/ulm.txt b/ulm.txt
index 0644f2474be8..8fd140c4415f 100644
--- a/ulm.txt
+++ b/ulm.txt
@@ -14,6 +14,7 @@
'status': 'official'}
$ pmaint sync ulm
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 ulm
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 ulm
*** synced ulm
* Sync succeeded
$ git log --format=%ci -1