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