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