diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-12-24 10:04:59 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-12-24 10:04:59 +0000 |
| commit | ef0b91b75ff3a24978b0a412b63bb9662c735716 (patch) | |
| tree | 312ea9697e837e9d1efb9cc8e1d8b127e793b182 /gentoobr.txt | |
| parent | 2020-12-24T09:30:01Z (diff) | |
| download | repos-ef0b91b75ff3a24978b0a412b63bb9662c735716.tar.gz repos-ef0b91b75ff3a24978b0a412b63bb9662c735716.tar.bz2 repos-ef0b91b75ff3a24978b0a412b63bb9662c735716.zip | |
2020-12-24T10:00:01Z
Diffstat (limited to 'gentoobr.txt')
| -rw-r--r-- | gentoobr.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/gentoobr.txt b/gentoobr.txt index b21cf837f042..98f85756cc90 100644 --- a/gentoobr.txt +++ b/gentoobr.txt @@ -19,9 +19,21 @@ {'type': 'git', 'uri': 'git+ssh://git@github.com/gentoobr/overlay.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync gentoobr -Cloning into '/var/lib/repo-mirror-ci/sync/gentoobr'... +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 gentoobr *** synced gentoobr * Sync succeeded |