diff options
Diffstat (limited to 'librepilot.txt')
| -rw-r--r-- | librepilot.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/librepilot.txt b/librepilot.txt index ff08d5e62373..c3c3af39a7d0 100644 --- a/librepilot.txt +++ b/librepilot.txt @@ -12,8 +12,8 @@ 'uri': 'git+ssh://git@github.com/paul-jewell/librepilot-overlay.git'}], 'status': 'unofficial'} $ pmaint sync librepilot -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). 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 librepilot 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 +28,6 @@ or --ff-only on the command line to override the configured default per invocation. Already up to date. -*** syncing librepilot *** synced librepilot * Sync succeeded $ git log --format=%ci -1 |