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