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