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