summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'bumblebee.txt')
-rw-r--r--bumblebee.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/bumblebee.txt b/bumblebee.txt
index 55adc769b9a9..be4b91b4f2f4 100644
--- a/bumblebee.txt
+++ b/bumblebee.txt
@@ -10,7 +10,6 @@
'uri': 'git://github.com/Bumblebee-Project/bumblebee-gentoo'}],
'status': 'unofficial'}
$ pmaint sync bumblebee
-*** syncing bumblebee
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,6 +24,7 @@ or --ff-only on the command line to override the configured default per
invocation.
Already up to date.
+*** syncing bumblebee
*** synced bumblebee
* Sync succeeded
$ git log --format=%ci -1