diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-05-19 19:49:57 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-05-19 19:49:57 +0000 |
| commit | 8cb418496b0e1fb242573d64e582951e7b80bd70 (patch) | |
| tree | c689946d97369639258cf336dc83bd03a6794249 /pixlra.txt | |
| parent | 2021-05-19T19:30:01Z (diff) | |
| download | repos-8cb418496b0e1fb242573d64e582951e7b80bd70.tar.gz repos-8cb418496b0e1fb242573d64e582951e7b80bd70.tar.bz2 repos-8cb418496b0e1fb242573d64e582951e7b80bd70.zip | |
2021-05-19T19:45:01Z
Diffstat (limited to 'pixlra.txt')
| -rw-r--r-- | pixlra.txt | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/pixlra.txt b/pixlra.txt index f1d0db8c5ad2..2c60a5a3e7ba 100644 --- a/pixlra.txt +++ b/pixlra.txt @@ -19,6 +19,20 @@ 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. Already up to date. *** synced pixlra * Sync succeeded |