diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2020-09-02 17:05:10 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2020-09-02 17:05:10 +0000 |
| commit | e8a2f52ef1c67f6842ec04684ef06f64a85f82d5 (patch) | |
| tree | 1f522e52f9b0efe1db16c644f107db81333e53cc /Case_Of.txt | |
| parent | 2020-09-02T16:30:01Z (diff) | |
| download | repos-e8a2f52ef1c67f6842ec04684ef06f64a85f82d5.tar.gz repos-e8a2f52ef1c67f6842ec04684ef06f64a85f82d5.tar.bz2 repos-e8a2f52ef1c67f6842ec04684ef06f64a85f82d5.zip | |
2020-09-02T17:00:01Z
Diffstat (limited to 'Case_Of.txt')
| -rw-r--r-- | Case_Of.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/Case_Of.txt b/Case_Of.txt index 6dc76299751a..fec3920001e1 100644 --- a/Case_Of.txt +++ b/Case_Of.txt @@ -11,11 +11,23 @@ {'type': 'git', 'uri': 'git+ssh://git@framagit.org/Case_Of/gentoo-overlay.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync Case_Of WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). WARNING:pkgcore:flussence repo at '/var/lib/repo-mirror-ci/sync/flussence', doesn't specify masters in metadata/layout.conf. Please explicitly set masters (use "masters =" if the repo is standalone). -Cloning into '/var/lib/repo-mirror-ci/sync/Case_Of'... +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 Case_Of *** synced Case_Of * Sync succeeded |