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