diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-05-03 09:49:55 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-05-03 09:49:55 +0000 |
| commit | 6eb7c51cfd9d3fc834665511f9571999c4e47637 (patch) | |
| tree | e0dcf45b8885d6b55a40be5dcdcd6352037c7ffe /holgersson-overlay.txt | |
| parent | 2021-05-03T09:30:01Z (diff) | |
| download | repos-6eb7c51cfd9d3fc834665511f9571999c4e47637.tar.gz repos-6eb7c51cfd9d3fc834665511f9571999c4e47637.tar.bz2 repos-6eb7c51cfd9d3fc834665511f9571999c4e47637.zip | |
2021-05-03T09:45:01Z
Diffstat (limited to 'holgersson-overlay.txt')
| -rw-r--r-- | holgersson-overlay.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/holgersson-overlay.txt b/holgersson-overlay.txt index 0a11d8beeab5..330c9df406d4 100644 --- a/holgersson-overlay.txt +++ b/holgersson-overlay.txt @@ -10,10 +10,22 @@ 'status': 'unofficial'} pkgcore 0.11.2 -- extended version info unavailable - * Adding new repository $ pmaint sync holgersson-overlay *** syncing holgersson-overlay -Cloning into '/var/lib/repo-mirror-ci/sync/holgersson-overlay'... +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 holgersson-overlay * Sync succeeded $ git log --format=%ci -1 |