diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-10-23 13:36:13 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-10-23 13:36:13 +0000 |
| commit | 999dec99e30a92fa453f6273302d4ffec271f435 (patch) | |
| tree | a72c38eaa736e8a939ffabed3a99e4019c0370b7 /fordfrog.txt | |
| parent | 2020-10-23T13:00:01Z (diff) | |
| download | repos-999dec99e30a92fa453f6273302d4ffec271f435.tar.gz repos-999dec99e30a92fa453f6273302d4ffec271f435.tar.bz2 repos-999dec99e30a92fa453f6273302d4ffec271f435.zip | |
2020-10-23T13:30:01Z
Diffstat (limited to 'fordfrog.txt')
| -rw-r--r-- | fordfrog.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/fordfrog.txt b/fordfrog.txt index 03061b57ac0f..00324a65cce0 100644 --- a/fordfrog.txt +++ b/fordfrog.txt @@ -12,9 +12,21 @@ {'type': 'git', 'uri': 'git+ssh://git@git.gentoo.org/dev/fordfrog.git'}], 'status': 'official'} - * Adding new repository $ pmaint sync fordfrog -Cloning into '/var/lib/repo-mirror-ci/sync/fordfrog'... +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. *** syncing fordfrog *** synced fordfrog * Sync succeeded |