diff options
Diffstat (limited to 'gentoo.txt')
| -rw-r--r-- | gentoo.txt | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/gentoo.txt b/gentoo.txt index 67c84bb27bba..1756479e2667 100644 --- a/gentoo.txt +++ b/gentoo.txt @@ -16,20 +16,16 @@ pkgcore 0.12.8 $ pmaint --config /var/lib/repo-mirror-ci/data-sync/etc/portage sync gentoo *** syncing gentoo From https://anongit.gentoo.org/git/repo/gentoo - + 7bc2ad7946f...85b6295c035 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. -Already up to date. + 85b6295c035..f1cd1c6fcdf master -> origin/master +Updating 7bc2ad7946f..f1cd1c6fcdf +Fast-forward + .../{libreoffice-7.2.6.2.ebuild => libreoffice-7.2.6.2-r1.ebuild} | 2 +- + .../{libreoffice-7.3.2.2.ebuild => libreoffice-7.3.2.2-r1.ebuild} | 2 +- + app-office/libreoffice/libreoffice-7.3.9999.ebuild | 2 +- + app-office/libreoffice/libreoffice-9999.ebuild | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + rename app-office/libreoffice/{libreoffice-7.2.6.2.ebuild => libreoffice-7.2.6.2-r1.ebuild} (99%) + rename app-office/libreoffice/{libreoffice-7.3.2.2.ebuild => libreoffice-7.3.2.2-r1.ebuild} (99%) *** synced gentoo * Sync succeeded $ git log --format=%ci -1 |