diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-03-29 22:20:29 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-03-29 22:20:29 +0000 |
| commit | 3dd9333e451391321e8c8fb4e9b83add0461c37b (patch) | |
| tree | ad9ad86331cb015d795c2fb2ba58530254f4171f /megacoffee.txt | |
| parent | 2021-03-29T22:00:02Z (diff) | |
| download | repos-3dd9333e451391321e8c8fb4e9b83add0461c37b.tar.gz repos-3dd9333e451391321e8c8fb4e9b83add0461c37b.tar.bz2 repos-3dd9333e451391321e8c8fb4e9b83add0461c37b.zip | |
2021-03-29T22:15:01Z
Diffstat (limited to 'megacoffee.txt')
| -rw-r--r-- | megacoffee.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/megacoffee.txt b/megacoffee.txt index f4ed5f2bedb3..4c36617db070 100644 --- a/megacoffee.txt +++ b/megacoffee.txt @@ -20,10 +20,22 @@ 'source': [{'type': 'git', 'uri': 'https://gitlab.megacoffee.net/gentoo-overlay/megacoffee-overlay.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync megacoffee *** syncing megacoffee -Cloning into '/var/lib/repo-mirror-ci/sync/megacoffee'... +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 megacoffee * Sync succeeded $ git log --format=%ci -1 |