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