diff options
Diffstat (limited to 'chrisadr.txt')
| -rw-r--r-- | chrisadr.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrisadr.txt b/chrisadr.txt index f11a61bc4bfa..b89e81c869e5 100644 --- a/chrisadr.txt +++ b/chrisadr.txt @@ -12,6 +12,7 @@ 'uri': 'git@github.com:ChrisADR/chrisadr-overlay.git'}], 'status': 'unofficial'} $ pmaint sync chrisadr +*** syncing chrisadr 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 chrisadr *** synced chrisadr * Sync succeeded $ git log --format=%ci -1 |