summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2021-05-04 06:34:54 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2021-05-04 06:34:54 +0000
commit4ef5b705c32d26cf3d113554782d8699dd0f0c15 (patch)
tree714eac1a23fdb5e6bf2f152f036fb1559ea9121c /sabayon.txt
parent2021-05-04T06:15:01Z (diff)
downloadrepos-4ef5b705c32d26cf3d113554782d8699dd0f0c15.tar.gz
repos-4ef5b705c32d26cf3d113554782d8699dd0f0c15.tar.bz2
repos-4ef5b705c32d26cf3d113554782d8699dd0f0c15.zip
2021-05-04T06:30:01Z
Diffstat (limited to 'sabayon.txt')
-rw-r--r--sabayon.txt13
1 files changed, 0 insertions, 13 deletions
diff --git a/sabayon.txt b/sabayon.txt
index eb933e3ac41..1da00a844a5 100644
--- a/sabayon.txt
+++ b/sabayon.txt
@@ -16,19 +16,6 @@ pkgcore 0.11.2 -- extended version info unavailable
$ pmaint sync sabayon
*** syncing sabayon
-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.
*** synced sabayon
* Sync succeeded