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