summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2021-05-19 20:04:58 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2021-05-19 20:04:58 +0000
commit30bb8378aed37fe9daf67cac170a18f4209cae36 (patch)
tree693d475a52fb9f274a03f388531b6ed66725628e /pixlra.txt
parent2021-05-19T19:45:01Z (diff)
downloadrepos-30bb8378aed37fe9daf67cac170a18f4209cae36.tar.gz
repos-30bb8378aed37fe9daf67cac170a18f4209cae36.tar.bz2
repos-30bb8378aed37fe9daf67cac170a18f4209cae36.zip
2021-05-19T20:00:01Z
Diffstat (limited to 'pixlra.txt')
-rw-r--r--pixlra.txt14
1 files changed, 1 insertions, 13 deletions
diff --git a/pixlra.txt b/pixlra.txt
index 2c60a5a3e7ba..1f30b1c22528 100644
--- a/pixlra.txt
+++ b/pixlra.txt
@@ -20,19 +20,7 @@ pkgcore 0.11.8
$ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync pixlra
*** syncing pixlra
From https://anongit.gentoo.org/git/user/carreira
- + 998da37...a9ef387 master -> origin/master (forced update)
-hint: Pulling without specifying how to reconcile divergent branches is
-hint: discouraged. You can squelch this message by running one of the following
-hint: commands sometime before your next pull:
-hint:
-hint: git config pull.rebase false # merge (the default strategy)
-hint: git config pull.rebase true # rebase
-hint: git config pull.ff only # fast-forward only
-hint:
-hint: You can replace "git config" with "git config --global" to set a default
-hint: preference for all repositories. You can also pass --rebase, --no-rebase,
-hint: or --ff-only on the command line to override the configured default per
-hint: invocation.
+ a9ef387..998da37 master -> origin/master
Already up to date.
*** synced pixlra
* Sync succeeded