diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-03-03 03:06:58 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-03-03 03:06:58 +0000 |
| commit | 014b943b60d0498a6eb8f64ca5e97777af6730a8 (patch) | |
| tree | 810731576b4d6b92e02570411d373ea269baabfc /quarks.txt | |
| parent | 2021-03-03T02:45:01Z (diff) | |
| download | repos-014b943b60d0498a6eb8f64ca5e97777af6730a8.tar.gz repos-014b943b60d0498a6eb8f64ca5e97777af6730a8.tar.bz2 repos-014b943b60d0498a6eb8f64ca5e97777af6730a8.zip | |
2021-03-03T03:00:01Z
Diffstat (limited to 'quarks.txt')
| -rw-r--r-- | quarks.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/quarks.txt b/quarks.txt index 6ec35b55bd27..0607b4823ac8 100644 --- a/quarks.txt +++ b/quarks.txt @@ -9,9 +9,21 @@ 'source': [{'type': 'git', 'uri': 'https://git.zero-downtime.net/quark/quarks.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync quarks -Cloning into '/var/lib/repo-mirror-ci/sync/quarks'... +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 quarks *** synced quarks * Sync succeeded |