summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sorinp.txt')
-rw-r--r--sorinp.txt13
1 files changed, 13 insertions, 0 deletions
diff --git a/sorinp.txt b/sorinp.txt
index b2a871f9cf8c..da19dcc84f61 100644
--- a/sorinp.txt
+++ b/sorinp.txt
@@ -11,6 +11,19 @@
'uri': 'https://github.com/psihozefir/sorinp-gentoo-overlay'}],
'status': 'unofficial'}
$ pmaint sync sorinp
+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 sorinp
*** synced sorinp