diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-05-02 10:34:55 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-05-02 10:34:55 +0000 |
| commit | deaefa36059a424422c57f0e579be9860404623c (patch) | |
| tree | fe54b8dde929b3c2fd6b9392f041cb2a9b2df62b /megacoffee.txt | |
| parent | 2021-05-02T10:15:01Z (diff) | |
| download | repos-deaefa36059a424422c57f0e579be9860404623c.tar.gz repos-deaefa36059a424422c57f0e579be9860404623c.tar.bz2 repos-deaefa36059a424422c57f0e579be9860404623c.zip | |
2021-05-02T10:30: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 5012d1a43c76..0e7f01c0f5d2 100644 --- a/megacoffee.txt +++ b/megacoffee.txt @@ -22,10 +22,22 @@ 'status': 'unofficial'} pkgcore 0.11.2 -- extended version info unavailable - * 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 |