diff options
Diffstat (limited to 'gnuradio.txt')
| -rw-r--r-- | gnuradio.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gnuradio.txt b/gnuradio.txt index 7f2b77e0098a..bb0bc5166d77 100644 --- a/gnuradio.txt +++ b/gnuradio.txt @@ -8,7 +8,7 @@ 'uri': 'https://github.com/hololeap/gentoo-gnuradio'}], 'status': 'unofficial'} $ pmaint sync gnuradio -WARNING:pkgcore:flewkey-overlay repo at '/var/lib/repo-mirror-ci/sync/flewkey-overlay', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). +*** syncing gnuradio 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: @@ -23,7 +23,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing gnuradio *** synced gnuradio * Sync succeeded $ git log --format=%ci -1 |