summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2020-08-16 06:35:42 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2020-08-16 06:35:42 +0000
commite5de98d7bc70d8b1e09fcf616ce129d2e4eddd6b (patch)
treebf6bdfce87d771a3b0e536844e49f003b1ab30cf /ArtSoftware.txt
parent2020-08-16T06:00:01Z (diff)
downloadrepos-e5de98d7bc70d8b1e09fcf616ce129d2e4eddd6b.tar.gz
repos-e5de98d7bc70d8b1e09fcf616ce129d2e4eddd6b.tar.bz2
repos-e5de98d7bc70d8b1e09fcf616ce129d2e4eddd6b.zip
2020-08-16T06:30:01Z
Diffstat (limited to 'ArtSoftware.txt')
-rw-r--r--ArtSoftware.txt13
1 files changed, 13 insertions, 0 deletions
diff --git a/ArtSoftware.txt b/ArtSoftware.txt
index 4cd6cc42967d..011e7d5fb68f 100644
--- a/ArtSoftware.txt
+++ b/ArtSoftware.txt
@@ -9,6 +9,19 @@
'uri': 'http://git.art-software.fr/ArtSoftware/portageLocalRepo.git'}],
'status': 'unofficial'}
$ pmaint sync ArtSoftware
+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.
+
warning: redirecting to https://git.art-software.fr/ArtSoftware/portageLocalRepo.git/
Already up to date.
*** syncing ArtSoftware