diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-03-13 17:35:57 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-03-13 17:35:57 +0000 |
| commit | 8f8226cad25e0c39f4f334ed14b68fa417d01ebd (patch) | |
| tree | eaa24b4aea18cf1e8f7d0682f6235f66272cc02a /SwordArMor.txt | |
| parent | 2021-03-13T17:15:01Z (diff) | |
| download | repos-8f8226cad25e0c39f4f334ed14b68fa417d01ebd.tar.gz repos-8f8226cad25e0c39f4f334ed14b68fa417d01ebd.tar.bz2 repos-8f8226cad25e0c39f4f334ed14b68fa417d01ebd.zip | |
2021-03-13T17:30:01Z
Diffstat (limited to 'SwordArMor.txt')
| -rw-r--r-- | SwordArMor.txt | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/SwordArMor.txt b/SwordArMor.txt index da582e182c1b..a9bfd424588f 100644 --- a/SwordArMor.txt +++ b/SwordArMor.txt @@ -10,9 +10,21 @@ {'type': 'git', 'uri': 'git+ssh://git@git.grifon.fr:alarig/SwordArMor-gentoo-overlay.git'}], 'status': 'unofficial'} - * Adding new repository $ pmaint sync SwordArMor -Cloning into '/var/lib/repo-mirror-ci/sync/SwordArMor'... +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 SwordArMor *** synced SwordArMor * Sync succeeded |