diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-01-18 11:40:56 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-01-18 11:40:56 +0000 |
| commit | 4707b8a46f699dc97b9048649263bcf722519b69 (patch) | |
| tree | ac7bffd5a306504f89d4c256450aca8e93da9674 /gentoo-bootstrap.txt | |
| parent | 2021-01-18T09:30:01Z (diff) | |
| download | repos-4707b8a46f699dc97b9048649263bcf722519b69.tar.gz repos-4707b8a46f699dc97b9048649263bcf722519b69.tar.bz2 repos-4707b8a46f699dc97b9048649263bcf722519b69.zip | |
2021-01-18T10:30:01Z
Diffstat (limited to 'gentoo-bootstrap.txt')
| -rw-r--r-- | gentoo-bootstrap.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/gentoo-bootstrap.txt b/gentoo-bootstrap.txt index 43778f73bc99..f7c243959b45 100644 --- a/gentoo-bootstrap.txt +++ b/gentoo-bootstrap.txt @@ -11,9 +11,21 @@ {'type': 'git', 'uri': 'git+ssh://git@gitlab.com:stikonas/gentoo-bootstrap.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync gentoo-bootstrap -Cloning into '/var/lib/repo-mirror-ci/sync/gentoo-bootstrap'... +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 gentoo-bootstrap *** synced gentoo-bootstrap * Sync succeeded |