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