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