summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'flow.txt')
-rw-r--r--flow.txt16
1 files changed, 14 insertions, 2 deletions
diff --git a/flow.txt b/flow.txt
index badb6fb7b36..cc30eb4f518 100644
--- a/flow.txt
+++ b/flow.txt
@@ -8,9 +8,21 @@
'source': [{'type': 'git',
'uri': 'https://gitlab.com/Flow/flow-s-ebuilds.git'}],
'status': 'unofficial'}
- * Adding new repository
$ pmaint sync flow
-Cloning into '/var/lib/repo-mirror-ci/sync/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:
+
+ git config pull.rebase false # merge (the default strategy)
+ git config pull.rebase true # rebase
+ git config pull.ff only # fast-forward only
+
+You can replace "git config" with "git config --global" to set a default
+preference for all repositories. You can also pass --rebase, --no-rebase,
+or --ff-only on the command line to override the configured default per
+invocation.
+
+Already up to date.
*** syncing flow
*** synced flow
* Sync succeeded