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