diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-04-04 08:05:35 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-04-04 08:05:35 +0000 |
| commit | 549b6277297281378852d858a7d5558eb8687063 (patch) | |
| tree | 7917435cbefbc2ac21c9cb17dbe1de06a976eec9 /slonko.txt | |
| parent | 2021-04-04T07:45:01Z (diff) | |
| download | repos-549b6277297281378852d858a7d5558eb8687063.tar.gz repos-549b6277297281378852d858a7d5558eb8687063.tar.bz2 repos-549b6277297281378852d858a7d5558eb8687063.zip | |
2021-04-04T08:00:01Z
Diffstat (limited to 'slonko.txt')
| -rw-r--r-- | slonko.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/slonko.txt b/slonko.txt index 3f174b74c5f3..0db37a0a2cef 100644 --- a/slonko.txt +++ b/slonko.txt @@ -8,10 +8,22 @@ 'quality': 'experimental', 'source': [{'type': 'git', 'uri': 'https://slonko.net/git/portage'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync slonko *** syncing slonko -Cloning into '/var/lib/repo-mirror-ci/sync/slonko'... +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 slonko * Sync succeeded $ git log --format=%ci -1 |